diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-12 14:12:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 14:12:55 +0100 |
| commit | 5bd1b675c668cf249ebdeaf72ec6fe5b5f4fab00 (patch) | |
| tree | 73e6146446b87c850b881020fdbd703c5e298b1c /pkgs/tools | |
| parent | c2129a850a311d984ea6aa602ea86e3bb127b289 (diff) | |
| parent | fbeeed1c5c81dec0823ca12691a6cd66d5c7599f (diff) | |
| download | nixlib-5bd1b675c668cf249ebdeaf72ec6fe5b5f4fab00.tar nixlib-5bd1b675c668cf249ebdeaf72ec6fe5b5f4fab00.tar.gz nixlib-5bd1b675c668cf249ebdeaf72ec6fe5b5f4fab00.tar.bz2 nixlib-5bd1b675c668cf249ebdeaf72ec6fe5b5f4fab00.tar.lz nixlib-5bd1b675c668cf249ebdeaf72ec6fe5b5f4fab00.tar.xz nixlib-5bd1b675c668cf249ebdeaf72ec6fe5b5f4fab00.tar.zst nixlib-5bd1b675c668cf249ebdeaf72ec6fe5b5f4fab00.zip | |
Merge pull request #48266 from volth/patch-265
p7zip: fix cross-compilation
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/archivers/p7zip/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 4886217211df..5430c2cb73e7 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { # I think this is a typo and should be CXX? Either way let's kill it sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits + '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace makefile.machine \ + --replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \ + --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++' ''; preConfigure = '' |