From 15d8d27bd66a336e2a26537448d87cfe2d025b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 20 May 2024 11:46:27 +0200 Subject: [PATCH] util-linux: also downgrade static builds already We need this now to fix nixStatic build: https://hydra.nixos.org/build/259722977 /cc PR #309805 --- 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 41b022496273..ef3614bce02e 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 = stdenv.isLinux && stdenv.is64bit; + avoidRebuild = with stdenv.hostPlatform; isLinux && is64bit && !isStatic; in stdenv.mkDerivation rec { pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal";