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

pkgs/tools: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-15 17:12:36 +07:00
parent 94f3683935
commit 8c5d37129f
916 changed files with 2510 additions and 2510 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/archivers/unzip/default.nix
+6 -6
View File
@@ -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;
};
}