From 2b1ce6154862ad7f2bac1c90628fc44f9a66b209 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Mon, 31 Aug 2020 10:45:53 +0200 Subject: [PATCH] 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. --- pkgs/tools/misc/mbuffer/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) 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 = {