Merge pull request #108970 from xaverdh/pkgs-stdenv-lib

treewide: simplify pkgs.stdenv.lib -> pkgs.lib
2021-01-10 22:47:38 +01:00
parent 07f8292f88 25bef2d8f9
commit d085417683
260 changed files with 270 additions and 270 deletions
--- a/pkgs/development/tools/misc/ctags/wrapped.nix
+++ b/pkgs/development/tools/misc/ctags/wrapped.nix
@@ -1,6 +1,6 @@
 { pkgs, ctags }:

-with pkgs.stdenv.lib;
+with pkgs.lib;

 # define some ctags wrappers adding support for some not that common languages
 # customization:
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -407,7 +407,7 @@ self: super:
        export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config
      '';

-      __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
+      __impureHostDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];

      passthru = old.passthru // { llvm = pkgs.llvm; };
    }