diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 16:19:50 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 17:12:36 +0700 |
| commit | 8c5d37129fc5097d9fb52e95fb07de75392d1c3c (patch) | |
| tree | 40cfd341b87811008151e9ecf053cf7449574b98 /pkgs/tools/archivers/unzip | |
| parent | 94f36839357387fd711d17d762d88c69767f265b (diff) | |
| download | nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.gz nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.bz2 nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.lz nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.xz nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.zst nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.zip | |
pkgs/tools: stdenv.lib -> lib
Diffstat (limited to 'pkgs/tools/archivers/unzip')
| -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 b3b150637d6..cfd764aa11e 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; }; } |