From 12b781a945aa4c6c8d95f36161780f693a43c73d Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Oct 2014 19:37:09 +0100 Subject: [PATCH] cygwin: zip --- pkgs/tools/archivers/zip/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 92d8a22fa47..e4da0236cdf 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";