diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-24 00:15:07 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-24 00:16:29 +0700 |
commit | 2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4 (patch) | |
tree | fd273f1e48a30237aa9b96342f6324757a4ca09f /pkgs/development/haskell-modules/make-package-set.nix | |
parent | ec334a1b01c491faa3463c96717b71921dddef2c (diff) | |
download | nixlib-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.tar nixlib-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.tar.gz nixlib-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.tar.bz2 nixlib-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.tar.lz nixlib-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.tar.xz nixlib-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.tar.zst nixlib-2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4.zip |
pkgs/development: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 91937b88eaff..28b48bfcbc4a 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -41,7 +41,7 @@ self: let inherit (stdenv) buildPlatform hostPlatform; - inherit (stdenv.lib) fix' extends makeOverridable; + inherit (lib) fix' extends makeOverridable; inherit (haskellLib) overrideCabal; mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { @@ -84,8 +84,8 @@ let # lost on `.override`) but determine the auto-args based on `drv` (the problem here # is that nix has no way to "passthrough" args while preserving the reflection # info that callPackage uses to determine the arguments). - drv = if stdenv.lib.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (stdenv.lib.functionArgs drv) scope; + drv = if lib.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (lib.functionArgs drv) scope; # this wraps the `drv` function to add a `overrideScope` function to the result. drvScope = allArgs: drv allArgs // { @@ -98,7 +98,7 @@ let # nothing. in callPackageWithScope newScope drv manualArgs; }; - in stdenv.lib.makeOverridable drvScope (auto // manualArgs); + in lib.makeOverridable drvScope (auto // manualArgs); mkScope = scope: let ps = pkgs.__splicedPackages; |