public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93439 from cript0nauta/p7zip-unfree

Browse Source 
p7zip: fix build when enableUnfree is true
This commit is contained in:
worldofpeace 2020-07-18 18:03:47 -04:00 committed by GitHub
commit a5fc5dad56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/archivers/p7zip/default.nix
View File

@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
# Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional
postPatch = '' postPatch = ''
sed -i '/CC=\/usr/d' makefile.macosx_llvm_64bits sed -i '/CC=\/usr/d' makefile.macosx_llvm_64bits
chmod +x install.sh
# I think this is a typo and should be CXX? Either way let's kill it # 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 sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits
@ -28,7 +29,6 @@ stdenv.mkDerivation rec {
# (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar) # (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar)
rm -r CPP/7zip/Compress/Rar* rm -r CPP/7zip/Compress/Rar*
find . -name makefile'*' -exec sed -i '/Rar/d' {} + find . -name makefile'*' -exec sed -i '/Rar/d' {} +
chmod +x install.sh
''; '';
preConfigure = '' preConfigure = ''