public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unzip: *Flags are lists

Browse Source
This commit is contained in:
Robin Gloster 2019-10-26 17:39:27 +02:00 committed by Jan Tojnar
parent 53cbd1b7bf
commit e49f0d4985
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/archivers/unzip/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
patchFlags = "-p1 -F3"; patchFlags = [ "-p1" "-F3" ];
patches = [ patches = [
./CVE-2014-8139.diff ./CVE-2014-8139.diff
@ -53,15 +53,21 @@ stdenv.mkDerivation {
makefile = "unix/Makefile"; 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 = '' 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 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; setupHook = ./setup-hook.sh;