summary refs log tree commit diff
diff options
context:
space:
mode:
authorGaelan Steele <gbs@canishe.com>2020-05-12 11:52:29 -0700
committerGaelan Steele <gbs@canishe.com>2020-05-12 12:16:08 -0700
commitb6beb43dd7c20e34d3d9e2078b0fa2945009c9b9 (patch)
tree6110d7d2e6872e429cf02e62ab2a1d8fe50823b8
parentc89072465c75c1a9acf51d623cdbc51d1f37c168 (diff)
downloadnixpkgs-b6beb43dd7c20e34d3d9e2078b0fa2945009c9b9.tar
nixpkgs-b6beb43dd7c20e34d3d9e2078b0fa2945009c9b9.tar.gz
nixpkgs-b6beb43dd7c20e34d3d9e2078b0fa2945009c9b9.tar.bz2
nixpkgs-b6beb43dd7c20e34d3d9e2078b0fa2945009c9b9.tar.lz
nixpkgs-b6beb43dd7c20e34d3d9e2078b0fa2945009c9b9.tar.xz
nixpkgs-b6beb43dd7c20e34d3d9e2078b0fa2945009c9b9.tar.zst
nixpkgs-b6beb43dd7c20e34d3d9e2078b0fa2945009c9b9.zip
kexectools: always pass host and target to configure
Fixes #56290.
-rw-r--r--pkgs/os-specific/linux/kexectools/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index b1abf50f5f1..a70cb2e087f 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" "pic" "relro" "pie" ];
 
+  # Prevent kexec-tools from using uname to detect target, which is wrong in
+  # cases like compiling for aarch32 on aarch64
+  configurePlatforms = [ "build" "host" ];
   configureFlags = [ "BUILD_CC=${buildPackages.stdenv.cc.targetPrefix}cc" ];
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   buildInputs = [ zlib ];