From d2b0bf5658256ccc85f2cad097d45f82e7804e9c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 22 May 2024 18:28:24 +0200 Subject: [PATCH] Revert "util-linux: also downgrade static builds already" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 15d8d27bd66a336e2a26537448d87cfe2d025b7a. Too many issues with 2.40 for now — we're reverting to 2.39. --- pkgs/os-specific/linux/util-linux/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index ef3614bce02ef..41b022496273c 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -22,7 +22,7 @@ let # Temporarily avoid applying the patches on systems where already we have binaries # (in particular x86_64-linux and aarch64-linux) as the package is a huge rebuild there. - avoidRebuild = with stdenv.hostPlatform; isLinux && is64bit && !isStatic; + avoidRebuild = stdenv.isLinux && stdenv.is64bit; in stdenv.mkDerivation rec { pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal";