diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-07-18 18:03:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 18:03:47 -0400 |
| commit | a5fc5dad56a7a3e8fd493feaaa039e69b3c8a0d8 (patch) | |
| tree | d16315091c82eec3baa5a09c989b8364ff3ed9f4 /pkgs/tools | |
| parent | 72e242d5215a7a9e4f60b68f940ccf1cec455a87 (diff) | |
| parent | 410dbaa077187f9dd704cb0a331ef162aa24abfb (diff) | |
| download | nixpkgs-a5fc5dad56a7a3e8fd493feaaa039e69b3c8a0d8.tar nixpkgs-a5fc5dad56a7a3e8fd493feaaa039e69b3c8a0d8.tar.gz nixpkgs-a5fc5dad56a7a3e8fd493feaaa039e69b3c8a0d8.tar.bz2 nixpkgs-a5fc5dad56a7a3e8fd493feaaa039e69b3c8a0d8.tar.lz nixpkgs-a5fc5dad56a7a3e8fd493feaaa039e69b3c8a0d8.tar.xz nixpkgs-a5fc5dad56a7a3e8fd493feaaa039e69b3c8a0d8.tar.zst nixpkgs-a5fc5dad56a7a3e8fd493feaaa039e69b3c8a0d8.zip | |
Merge pull request #93439 from cript0nauta/p7zip-unfree
p7zip: fix build when enableUnfree is true
Diffstat (limited to 'pkgs/tools')
| -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 773d37f0b75..a155c1717eb 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 = '' |