diff options
author | Will Fancher <elvishjerricco@gmail.com> | 2017-07-12 23:58:54 -0400 |
---|---|---|
committer | Will Fancher <elvishjerricco@gmail.com> | 2017-07-13 14:56:13 -0400 |
commit | 8b764960e93f60cb0896a8866f8e53e331726985 (patch) | |
tree | 0e0b5b80f602a19aa194e22a27f56ae953a3c10a /pkgs/development/idris-modules/default.nix | |
parent | 5a5f8613e09b9a94466e564b0d8fa18da022c34d (diff) | |
download | nixlib-8b764960e93f60cb0896a8866f8e53e331726985.tar nixlib-8b764960e93f60cb0896a8866f8e53e331726985.tar.gz nixlib-8b764960e93f60cb0896a8866f8e53e331726985.tar.bz2 nixlib-8b764960e93f60cb0896a8866f8e53e331726985.tar.lz nixlib-8b764960e93f60cb0896a8866f8e53e331726985.tar.xz nixlib-8b764960e93f60cb0896a8866f8e53e331726985.tar.zst nixlib-8b764960e93f60cb0896a8866f8e53e331726985.zip |
Added `overrideScope` for `callPackageWith`
Consequently removing several ad-hoc definitions of the same concept.
Diffstat (limited to 'pkgs/development/idris-modules/default.nix')
-rw-r--r-- | pkgs/development/idris-modules/default.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 3d0ea511e101..9d2ebda00c4e 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -1,17 +1,8 @@ { pkgs, idris, overrides ? (self: super: {}) }: let inherit (pkgs.lib) callPackageWith fix' extends; - /* Taken from haskell-modules/default.nix, should probably abstract this away */ - callPackageWithScope = scope: drv: args: (callPackageWith scope drv args) // { - overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args; - }; - - mkScope = scope : pkgs // pkgs.xorg // pkgs.gnome2 // scope; - idrisPackages = self: let - defaultScope = mkScope self; - - callPackage = callPackageWithScope defaultScope; + callPackage = callPackageWith (pkgs // pkgs.xorg // pkgs.gnome2 // self); builtins_ = pkgs.lib.mapAttrs self.build-builtin-package { prelude = []; |