From c087ea5f812ccb18994992d67085da6a4ad231ca Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Tue, 15 Dec 2015 09:37:57 +0000 Subject: [PATCH] zip: fixed build phase (i.e. unicode support) The build did not use the current build infrastructure correctly. As a consequence zip lacked support for unicode and 64bit files. --- pkgs/tools/archivers/zip/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index e4da0236cdf..585bc72ad96 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -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 [];