summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristian Kampka <christian@kampka.net>2020-08-31 10:45:53 +0200
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2020-08-31 17:55:14 +0200
commit2b1ce6154862ad7f2bac1c90628fc44f9a66b209 (patch)
tree43826afce45a84613bba4e4eb15afe0bde8f5002
parent9be67b2eeb4c49058ec7c6a2ed4434994dba4117 (diff)
downloadnixpkgs-2b1ce6154862ad7f2bac1c90628fc44f9a66b209.tar
nixpkgs-2b1ce6154862ad7f2bac1c90628fc44f9a66b209.tar.gz
nixpkgs-2b1ce6154862ad7f2bac1c90628fc44f9a66b209.tar.bz2
nixpkgs-2b1ce6154862ad7f2bac1c90628fc44f9a66b209.tar.lz
nixpkgs-2b1ce6154862ad7f2bac1c90628fc44f9a66b209.tar.xz
nixpkgs-2b1ce6154862ad7f2bac1c90628fc44f9a66b209.tar.zst
nixpkgs-2b1ce6154862ad7f2bac1c90628fc44f9a66b209.zip
mbuffer: Use objdump from environment when cross-building
The mbuffer configure scripts fails to recognize the correct
objdump binary during cross-building for foreign platforms.
The correct objdump is exposed via the environment variable
$OBJDUMP, which should be used in such cases.
-rw-r--r--pkgs/tools/misc/mbuffer/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index 8b1cb938fb7..d86f824b87f 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ openssl ];
+
+  # The mbuffer configure scripts fails to recognize the correct
+  # objdump binary during cross-building for foreign platforms.
+  # The correct objdump is exposed via the environment variable
+  # $OBJDUMP, which should be used in such cases.
+  preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    substituteInPlace configure --replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}'
+  '';
   doCheck = true;
 
   meta = {