pkgs/tools: stdenv.lib -> lib

pkgs/tools/cd-dvd/bchunk/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7";
   };
 
-  makeFlags = stdenv.lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ];
+  makeFlags = lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ];
 
   installPhase = ''
     install -Dt $out/bin bchunk

pkgs/tools/cd-dvd/cdrkit/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}:
+{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}:
 
 stdenv.mkDerivation rec {
   name = "cdrkit-1.1.11";
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "http://cdrkit.org/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/cd-dvd/cue2pops/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation {
   pname = "cue2pops";
   version = "git-2018-01-04";

pkgs/tools/cd-dvd/dvdisaster/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ gettext pkgconfig which ];
   buildInputs = [ glib gtk2 ];
 
-  patches = stdenv.lib.optional enableSoftening [
+  patches = lib.optional enableSoftening [
     ./encryption.patch
     ./dvdrom.patch
   ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     "--docdir=share/doc"
     "--with-nls=yes"
     "--with-embedded-src-path=no"
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes";
+  ] ++ lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes";
 
   # fatal error: inlined-icons.h: No such file or directory
   enableParallelBuilding = false;

pkgs/tools/cd-dvd/uif2iso/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, zlib }:
+{ lib, stdenv, fetchurl, unzip, zlib }:
 
 stdenv.mkDerivation rec {
   nameNoVer = "uif2iso";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Tool for converting single/multi part UIF image files to ISO";
     homepage = "http://aluigi.org/mytoolz.htm#uif2iso";
-    license = stdenv.lib.licenses.gpl1Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl1Plus;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/cd-dvd/unetbootin/default.nix

@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     install -Dm644 -t $out/share/applications unetbootin.desktop
 
     wrapProgram $out/bin/unetbootin \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \
+      --prefix PATH : ${lib.makeBinPath [ mtools p7zip which ]} \
       --set QT_X11_NO_MITSHM 1
 
     runHook postInstall

pkgs/tools/cd-dvd/vobcopy/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libdvdread, libdvdcss }:
+{ lib, stdenv, fetchurl, libdvdread, libdvdcss }:
 
 stdenv.mkDerivation rec {
   name = "vobcopy-1.2.0";
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Copies DVD .vob files to harddisk, decrypting them on the way";
     homepage = "http://vobcopy.org/projects/c/c.shtml";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
 
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ lib.maintainers.bluescreen303 ];
+    platforms = lib.platforms.all;
   };
 }

pkgs/tools/cd-dvd/vobsub2srt/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }:
+{ lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }:
 
 let rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
     shortRev = builtins.substring 0 7 rev;
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/ruediger/VobSub2SRT";
     description = "Converts VobSub subtitles into SRT subtitles";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.ttuegel ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.ttuegel ];
   };
 }

pkgs/tools/cd-dvd/xorriso/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   buildInputs = [ libcdio zlib bzip2 readline libiconv ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ acl attr ];
+    ++ lib.optionals stdenv.isLinux [ acl attr ];
 
   meta = with lib; {
     description = "ISO 9660 Rock Ridge file system manipulator";