diff options
author | Dominik Xaver Hörl <hoe.dom@gmx.de> | 2021-01-10 20:08:30 +0100 |
---|---|---|
committer | Dominik Xaver Hörl <hoe.dom@gmx.de> | 2021-01-10 20:12:06 +0100 |
commit | 25bef2d8f91edfa80b86e1b777c520021a82131e (patch) | |
tree | 2d966cc19fb94a1b9346722448dcaaf0563342cb /pkgs/development | |
parent | f41dc35387a9b945eb3c50edadcfe07748ff22cb (diff) | |
download | nixlib-25bef2d8f91edfa80b86e1b777c520021a82131e.tar nixlib-25bef2d8f91edfa80b86e1b777c520021a82131e.tar.gz nixlib-25bef2d8f91edfa80b86e1b777c520021a82131e.tar.bz2 nixlib-25bef2d8f91edfa80b86e1b777c520021a82131e.tar.lz nixlib-25bef2d8f91edfa80b86e1b777c520021a82131e.tar.xz nixlib-25bef2d8f91edfa80b86e1b777c520021a82131e.tar.zst nixlib-25bef2d8f91edfa80b86e1b777c520021a82131e.zip |
treewide: simplify pkgs.stdenv.lib -> pkgs.lib
The library does not depend on stdenv, that `stdenv` exposes `lib` is an artifact of the ancient origins of nixpkgs.
Diffstat (limited to 'pkgs/development')
5 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 862b45299a63..00a8c8d520bb 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -92,7 +92,7 @@ self: super: base template-haskell ghcjs-base split containers text ghc-prim ]; description = "FFI QuasiQuoter for GHCJS"; - license = pkgs.stdenv.lib.licenses.mit; + license = pkgs.lib.licenses.mit; }) {}; # experimental ghcjs-vdom = self.callPackage @@ -112,7 +112,7 @@ self: super: base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split template-haskell ]; - license = pkgs.stdenv.lib.licenses.mit; + license = pkgs.lib.licenses.mit; description = "bindings for https://github.com/Matt-Esch/virtual-dom"; }) {}; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6d4e16f83786..30476a1a6ce5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -711,7 +711,7 @@ self: super: builtins.intersectAttrs super { # mplayer-spot uses mplayer at runtime. mplayer-spot = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.mplayer ]; + let path = pkgs.lib.makeBinPath [ pkgs.mplayer ]; in overrideCabal (addBuildTool super.mplayer-spot pkgs.makeWrapper) (oldAttrs: { postInstall = '' wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}" @@ -723,7 +723,7 @@ self: super: builtins.intersectAttrs super { primitive_0_7_1_0 = dontCheck super.primitive_0_7_1_0; cut-the-crap = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; + let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \ diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix index c94528e674f4..69d0ac6b7a5f 100644 --- a/pkgs/development/interpreters/erlang/R16B02-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -59,7 +59,7 @@ mkDerivation { knownVulnerabilities = [ "CVE-2017-1000385" ]; platforms = ["x86_64-linux" "x86_64-darwin"]; - license = pkgs.stdenv.lib.licenses.asl20; - maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ]; + license = pkgs.lib.licenses.asl20; + maintainers = with pkgs.lib.maintainers; [ mdaiter ]; }; } diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 08f8049aa8a1..f658e78d5db0 100644 --- 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: diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 16d66c48af8b..22627f3df1bc 100644 --- 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; }; } |