diff options
| author | Fabian Affolter <fabian@affolter-engineering.ch> | 2022-12-05 18:21:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-05 18:21:12 +0100 |
| commit | 79a3c26b6f668811a4dcd1878e091b95e6e0bf75 (patch) | |
| tree | 06d949dc7a3ec1d473c7580f0ec7479710fec70a | |
| parent | 445d20672ca859fc87a7276f278163f3b0ae9144 (diff) | |
| parent | d911353cf8af68ca67f24fe193a6bcdfe12d598f (diff) | |
| download | nixpkgs-79a3c26b6f668811a4dcd1878e091b95e6e0bf75.tar nixpkgs-79a3c26b6f668811a4dcd1878e091b95e6e0bf75.tar.gz nixpkgs-79a3c26b6f668811a4dcd1878e091b95e6e0bf75.tar.bz2 nixpkgs-79a3c26b6f668811a4dcd1878e091b95e6e0bf75.tar.lz nixpkgs-79a3c26b6f668811a4dcd1878e091b95e6e0bf75.tar.xz nixpkgs-79a3c26b6f668811a4dcd1878e091b95e6e0bf75.tar.zst nixpkgs-79a3c26b6f668811a4dcd1878e091b95e6e0bf75.zip | |
Merge pull request #204530 from skeuchel/cross-mbuffer
mbuffer: fix cross compilation
| -rw-r--r-- | pkgs/tools/misc/mbuffer/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index f01a0c6d4d5..c7f14cf6a58 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -16,18 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ openssl + ]; + nativeBuildInputs = [ which ]; - # 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 = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - substituteInPlace configure \ - --replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}' - ''; - doCheck = true; meta = with lib; { |