diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-13 09:48:20 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-13 09:48:20 +0200 |
| commit | 6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204 (patch) | |
| tree | b55f27e4cc46982ebddabf4935268e4ea38610c9 /pkgs/tools/archivers/p7zip/default.nix | |
| parent | ef93155f60284e7cd694ded81bd15f07997575bc (diff) | |
| parent | 35ce480d69778867c1de820188879bbad6bc2f75 (diff) | |
| download | nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.gz nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.bz2 nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.lz nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.xz nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.zst nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/tools/archivers/p7zip/default.nix')
| -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 = '' |