about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-01-31 14:02:19 -0500
committerShea Levy <shea@shealevy.com>2018-01-31 14:02:19 -0500
commit943592f69850fd07dd2422da062b1c1ebc45974d (patch)
tree3376a06cd3ab25a1622c8f320573ab09b55a9470 /pkgs/development/haskell-modules
parent0d7a0d7572d35526ddf34b6d011b7b88a8904b36 (diff)
downloadnixlib-943592f69850fd07dd2422da062b1c1ebc45974d.tar
nixlib-943592f69850fd07dd2422da062b1c1ebc45974d.tar.gz
nixlib-943592f69850fd07dd2422da062b1c1ebc45974d.tar.bz2
nixlib-943592f69850fd07dd2422da062b1c1ebc45974d.tar.lz
nixlib-943592f69850fd07dd2422da062b1c1ebc45974d.tar.xz
nixlib-943592f69850fd07dd2422da062b1c1ebc45974d.tar.zst
nixlib-943592f69850fd07dd2422da062b1c1ebc45974d.zip
Add setFunctionArgs lib function.
Among other things, this will allow *2nix tools to output plain data
while still being composable with the traditional
callPackage/.override interfaces.
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/make-package-set.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 223f06528879..0f866a96e71e 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -81,8 +81,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 builtins.isFunction fn then fn else import fn;
-      auto = builtins.intersectAttrs (builtins.functionArgs drv) scope;
+      drv = if stdenv.lib.isFunction fn then fn else import fn;
+      auto = builtins.intersectAttrs (stdenv.lib.functionArgs drv) scope;
 
       # this wraps the `drv` function to add a `overrideScope` function to the result.
       drvScope = allArgs: drv allArgs // {