Merge pull request #110912 from siraben/stdenv-lib-inherit

treewide: remove inherited stdenv.lib
2021-01-27 10:28:55 +01:00
parent 2ee93d61ad 3bbad8b041
commit ad97ca4e51
32 changed files with 37 additions and 52 deletions
@@ -3,7 +3,6 @@
 , gettext, vim, bc, screen }:

 let
-  inherit (stdenv) lib;
  pythonEnv = python3.withPackages (ps: with ps; [ snack ]);
 in
 stdenv.mkDerivation rec {
@@ -4,7 +4,6 @@
 , libXdamage, expat }:

 let
-  inherit (stdenv) lib;
  LD_LIBRARY_PATH = lib.makeLibraryPath
    [ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ];
 in
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetchurl
 , wrapQtAppsHook
 , pcsclite
@@ -16,8 +17,6 @@
 , yubikey-personalization
 }:

-let inherit (stdenv) lib; in
-
 stdenv.mkDerivation rec {
  pname = "yubikey-manager-qt";
  version = "1.1.5";