diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2014-10-26 19:37:09 +0100 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2015-05-28 10:53:36 +0200 |
| commit | 12b781a945aa4c6c8d95f36161780f693a43c73d (patch) | |
| tree | 68dbe517379e7665287dc11bbdf3d1eaf0efa1b4 /pkgs/tools/archivers | |
| parent | 6c7899b1f6a376f6a666060e095bab7f226c7f55 (diff) | |
| download | nixlib-12b781a945aa4c6c8d95f36161780f693a43c73d.tar nixlib-12b781a945aa4c6c8d95f36161780f693a43c73d.tar.gz nixlib-12b781a945aa4c6c8d95f36161780f693a43c73d.tar.bz2 nixlib-12b781a945aa4c6c8d95f36161780f693a43c73d.tar.lz nixlib-12b781a945aa4c6c8d95f36161780f693a43c73d.tar.xz nixlib-12b781a945aa4c6c8d95f36161780f693a43c73d.tar.zst nixlib-12b781a945aa4c6c8d95f36161780f693a43c73d.zip | |
cygwin: zip
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/zip/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 92d8a22fa476..e4da0236cdfe 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null }: +{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null, libiconv }: assert enableNLS -> libnatspec != null; @@ -13,13 +13,16 @@ 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"; - patches = if enableNLS then [ ./natspec-gentoo.patch.bz2 ] else []; + patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else []; - buildInputs = if enableNLS then [ libnatspec ] else []; + buildInputs = stdenv.lib.optional enableNLS libnatspec + ++ stdenv.lib.optional stdenv.isCygwin libiconv; meta = { description = "Compressor/archiver for creating and modifying zipfiles"; |