alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #48266 from volth/patch-265

Browse source 
p7zip: fix cross-compilation
This commit is contained in:
Jörg Thalheim 2018-10-12 14:12:55 +01:00 committed by GitHub
parent c2129a850a fbeeed1c5c
commit 5bd1b675c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/archivers/p7zip/default.nix
View file

@ -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 = ''