ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 13:08:39 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'zip-unicode' of git://github.com/spacefrogg/nixpkgs

Browse Source
This commit is contained in:
Shea Levy 2015-12-15 06:18:42 -05:00
commit 0fbe4bb21c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/archivers/zip/default.nix
View File

@ -13,11 +13,9 @@ stdenv.mkDerivation {
sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h";
};
# should be makeFlags on all archs, not changed yet to prevent rebuild
buildFlags="-f unix/Makefile generic";
makeFlags = if stdenv.isCygwin then "-f unix/Makefile ${if stdenv.isCygwin then "cygwin" else "generic"}" else null;
installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp";
makefile = "unix/Makefile";
buildFlags = if stdenv.isCygwin then "cygwin" else "generic";
installFlags = "prefix=$(out) INSTALL=cp";
patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else [];