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/beam-modules | |
| 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/beam-modules')
| -rw-r--r-- | pkgs/development/beam-modules/default.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index f0a049bb4b23..78ab61f73a49 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -5,14 +5,9 @@ let lib = pkgs.callPackage ./lib.nix {}; - # FIXME: add support for overrideScope - callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args; - mkScope = scope: pkgs // scope; - packages = self: let - defaultScope = mkScope self; - callPackage = drv: args: callPackageWithScope defaultScope drv args; + callPackage = stdenv.lib.callPackageWith (pkgs // self); in import ./hex-packages.nix { inherit pkgs stdenv callPackage; |