diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-26 17:39:27 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 11:13:42 +0100 |
| commit | e49f0d4985142ba0c4e54808d550bbdb824d5eae (patch) | |
| tree | 16623e9389dd19364d6724aa8888f8f09621e55f /pkgs/tools/archivers | |
| parent | 53cbd1b7bf398581a90d6db6521cb50fe55e8e40 (diff) | |
unzip: *Flags are lists
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/unzip/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 7bbcc906292d..b8f649fbdcbb 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - patchFlags = "-p1 -F3"; + patchFlags = [ "-p1" "-F3" ]; patches = [ ./CVE-2014-8139.diff @@ -53,15 +53,21 @@ stdenv.mkDerivation { makefile = "unix/Makefile"; - NIX_LDFLAGS = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec"; + NIX_LDFLAGS = "-lbz2" + stdenv.lib.optionalString enableNLS " -lnatspec"; - buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2"; + buildFlags = [ + "generic" + "D_USE_BZ2=-DUSE_BZIP2" + "L_BZ2=-lbz2" + ]; preConfigure = '' sed -i -e 's@CF="-O3 -Wall -I. -DASM_CRC $(LOC)"@CF="-O3 -Wall -I. -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(LOC)"@' unix/Makefile ''; - installFlags = "prefix=$(out)"; + installFlags = [ + "prefix=${placeholder ''out''}" + ]; setupHook = ./setup-hook.sh; |