diff options
Diffstat (limited to 'pkgs/tools/archivers/unzip/default.nix')
-rw-r--r-- | pkgs/tools/archivers/unzip/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index b3b150637d601..cfd764aa11ef5 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , bzip2 , enableNLS ? false, libnatspec }: @@ -41,7 +41,7 @@ stdenv.mkDerivation { name = "CVE-2019-13232-3.patch"; sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf"; }) - ] ++ stdenv.lib.optional enableNLS + ] ++ lib.optional enableNLS (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; name = "unzip-6.0-natspec.patch"; @@ -49,11 +49,11 @@ stdenv.mkDerivation { }); nativeBuildInputs = [ bzip2 ]; - buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec; + buildInputs = [ bzip2 ] ++ lib.optional enableNLS libnatspec; makefile = "unix/Makefile"; - NIX_LDFLAGS = "-lbz2" + stdenv.lib.optionalString enableNLS " -lnatspec"; + NIX_LDFLAGS = "-lbz2" + lib.optionalString enableNLS " -lnatspec"; buildFlags = [ "generic" @@ -74,7 +74,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.info-zip.org"; description = "An extraction utility for archives compressed in .zip format"; - license = stdenv.lib.licenses.free; # http://www.info-zip.org/license.html - platforms = stdenv.lib.platforms.all; + license = lib.licenses.free; # http://www.info-zip.org/license.html + platforms = lib.platforms.all; }; } |