diff options
author | Matías Lang <matiasl@infobytesec.com> | 2020-07-18 17:40:14 -0300 |
---|---|---|
committer | Matías Lang <matiasl@infobytesec.com> | 2020-07-18 17:40:14 -0300 |
commit | 410dbaa077187f9dd704cb0a331ef162aa24abfb (patch) | |
tree | 0ad47c870a0addbc6faa691398fe061d869b28f3 /pkgs | |
parent | cf059b32d98ec2642ddcf6eb9f9ae0ac445f2525 (diff) |
p7zip: fix build when enableUnfree is true
`chmod +x install.sh` was only being executed when enableUnfree was false. Therefore, building p7zip with enableUnfree set to true would fail because install.sh was not an executable file.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/archivers/p7zip/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 773d37f0b7586..a155c1717eb49 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -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 postPatch = '' 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 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) rm -r CPP/7zip/Compress/Rar* find . -name makefile'*' -exec sed -i '/Rar/d' {} + - chmod +x install.sh ''; preConfigure = '' |