pkgs/tools: stdenv.lib -> lib

15 files changed, 56 insertions, 56 deletions

diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix
index 3b4eb6a5ea5..7ef374b5bfe 100644
--- a/pkgs/tools/archivers/afio/default.nix
+++ b/pkgs/tools/archivers/afio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub } :
+{ lib, stdenv, fetchFromGitHub } :
 
 stdenv.mkDerivation rec {
   version = "2.5.2";
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/kholtman/afio";
     description = "Fault tolerant cpio archiver targeting backups";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
     /*
      * Licensing is complicated due to the age of the code base, but
      * generally free. See the file ``afio_license_issues_v5.txt`` for
      * a comprehensive discussion.
      */
-    license = stdenv.lib.licenses.free;
+    license = lib.licenses.free;
   };
 }
diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix
index 0d24ead456a..419a7d04ee3 100644
--- a/pkgs/tools/archivers/atool/default.nix
+++ b/pkgs/tools/archivers/atool/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, bash}:
+{lib, stdenv, fetchurl, perl, bash}:
 
 stdenv.mkDerivation {
   name = "atool-0.39.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.nongnu.org/atool";
     description = "Archive command line helper";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.gpl3;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.gpl3;
   };
 }
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 672c99d80c0..844bd8de29c 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, acl }:
+{ lib, stdenv, fetchurl, autoreconfHook, acl }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   # avoid retaining reference to CF during stdenv bootstrap
-  configureFlags = stdenv.lib.optionals stdenv.isDarwin [
+  configureFlags = lib.optionals stdenv.isDarwin [
     "gt_cv_func_CFPreferencesCopyAppValue=no"
     "gt_cv_func_CFLocaleCopyCurrent=no"
     "gt_cv_func_CFLocaleCopyPreferredLanguages=no"
@@ -24,19 +24,19 @@ stdenv.mkDerivation rec {
   # gnutar tries to call into gettext between `fork` and `exec`,
   # which is not safe on darwin.
   # see http://article.gmane.org/gmane.os.macosx.fink.devel/21882
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/system.c --replace '_(' 'N_('
   '';
 
   outputs = [ "out" "info" ];
 
   buildInputs = [ ]
-    ++ stdenv.lib.optional stdenv.isLinux acl
-    ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+    ++ lib.optional stdenv.isLinux acl
+    ++ lib.optional stdenv.isDarwin autoreconfHook;
 
   # May have some issues with root compilation because the bootstrap tool
   # cannot be used as a login shell for now.
-  FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1";
+  FORCE_UNSAFE_CONFIGURE = lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1";
 
   preConfigure = if stdenv.isCygwin then ''
     sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
@@ -64,10 +64,10 @@ stdenv.mkDerivation rec {
       archives).
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
 
     priority = 10;
   };
diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix
index d5d35a38251..701c7429d63 100644
--- a/pkgs/tools/archivers/innoextract/default.nix
+++ b/pkgs/tools/archivers/innoextract/default.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake makeWrapper ];
 
   # we need unar to for multi-archive extraction
-  postFixup = stdenv.lib.optionalString withGog ''
+  postFixup = lib.optionalString withGog ''
     wrapProgram $out/bin/innoextract \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ unar ]}
+      --prefix PATH : ${lib.makeBinPath [ unar ]}
   '';
 
   meta = with lib; {
diff --git a/pkgs/tools/archivers/ndstool/default.nix b/pkgs/tools/archivers/ndstool/default.nix
index 9a6350a8df1..de7f02ce846 100644
--- a/pkgs/tools/archivers/ndstool/default.nix
+++ b/pkgs/tools/archivers/ndstool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   pname = "ndstool";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/devkitPro/ndstool";
     description = "A tool to unpack and repack nds rom";
-    maintainers = [ stdenv.lib.maintainers.marius851000 ];
-    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.marius851000 ];
+    license = lib.licenses.gpl3;
   };
 }
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 90602cd42d8..ed2340ca628 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
     # I think this is a typo and should be CXX? Either way let's kill it
     sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits
-  '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+  '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
     substituteInPlace makefile.machine \
       --replace 'CC=gcc'  'CC=${stdenv.cc.targetPrefix}gcc' \
       --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++'
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     buildFlags=all3
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     cp makefile.macosx_llvm_64bits makefile.machine
   '';
 
@@ -41,13 +41,13 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
 
   meta = {
     homepage = "https://github.com/szcnick/p7zip";
     description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.raskin ];
     # RAR code is under non-free UnRAR license, but we remove it
     license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus;
   };
diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix
index 74ad0669d69..79a40e6ca6b 100644
--- a/pkgs/tools/archivers/pxattr/default.nix
+++ b/pkgs/tools/archivers/pxattr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gcc }:
+{ lib, stdenv, fetchurl, gcc }:
 
 stdenv.mkDerivation {
   name = "pxattr-2.1.0";
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.lesbonscomptes.com/pxattr/index.html";
     description = "Provides a single interface to extended file attributes";
-    maintainers = [ stdenv.lib.maintainers.vrthra ];
-    license = [ stdenv.lib.licenses.mit ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ lib.maintainers.vrthra ];
+    license = [ lib.licenses.mit ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix
index b9eaf3dba65..c251cfe0dc3 100644
--- a/pkgs/tools/archivers/runzip/default.nix
+++ b/pkgs/tools/archivers/runzip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libzip, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, libzip, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.4";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A tool to convert filename encoding inside a ZIP archive";
-    license = stdenv.lib.licenses.bsd2 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.bsd2 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix
index 30ff2bc36a2..dd3fb846288 100644
--- a/pkgs/tools/archivers/s-tar/default.nix
+++ b/pkgs/tools/archivers/s-tar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "s-tar";
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
       Note that unpacking tar archives may be a security risk because star may overwrite existing files.
     '';
     homepage = "http://cdrtools.sourceforge.net/private/star.html";
-    license = stdenv.lib.licenses.cddl;
-    maintainers = [ stdenv.lib.maintainers.wucke13 ];
+    license = lib.licenses.cddl;
+    maintainers = [ lib.maintainers.wucke13 ];
     platforms = [ "x86_64-linux" ];
   };
 }
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;
   };
 }
diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix
index 16e93470e89..8272b2fe598 100644
--- a/pkgs/tools/archivers/wimlib/default.nix
+++ b/pkgs/tools/archivers/wimlib/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = let
-    path = stdenv.lib.makeBinPath  [ cabextract cdrkit mtools ntfs3g syslinux ];
+    path = lib.makeBinPath  [ cabextract cdrkit mtools ntfs3g syslinux ];
   in ''
     for prog in $out/bin/*; do
       wrapProgram $prog --prefix PATH : ${path}
diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix
index 53da140b7fd..12490d96cb4 100644
--- a/pkgs/tools/archivers/xarchive/default.nix
+++ b/pkgs/tools/archivers/xarchive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, pkgconfig }:
+{ lib, stdenv, fetchurl, gtk2, pkgconfig }:
 
 stdenv.mkDerivation rec {
   version = "0.2.8-6";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A GTK front-end for command line archiving tools";
-    maintainers = [ stdenv.lib.maintainers.domenkozar ];
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ lib.maintainers.domenkozar ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix
index 022c05a4c6f..e7c3392731a 100644
--- a/pkgs/tools/archivers/xarchiver/default.nix
+++ b/pkgs/tools/archivers/xarchiver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper,
+{ lib, stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper,
   coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapProgram $out/bin/xarchiver \
-    --prefix PATH : ${stdenv.lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]}
+    --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]}
   '';
 
   meta = {
     description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
     homepage = "https://github.com/ib/xarchiver";
-    maintainers = [ stdenv.lib.maintainers.domenkozar ];
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ lib.maintainers.domenkozar ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 74f1982a425..f8131046df1 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
 
   patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else [];
 
-  buildInputs = stdenv.lib.optional enableNLS libnatspec
-    ++ stdenv.lib.optional stdenv.isCygwin libiconv;
+  buildInputs = lib.optional enableNLS libnatspec
+    ++ lib.optional stdenv.isCygwin libiconv;
 
   meta = with lib; {
     description = "Compressor/archiver for creating and modifying zipfiles";
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index 6abad5a17be..1ff204babc1 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -11,9 +11,9 @@ let
     sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk";
   };
 
-  compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread"
-    ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT");
+  compileFlags = lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ]
+    ++ lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread"
+    ++ lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT");
 in
 stdenv.mkDerivation {
   inherit (s) name version;