diff options
| author | Shea Levy <shea@shealevy.com> | 2017-09-28 18:10:50 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-09-28 18:10:50 -0400 |
| commit | c3af1210b4c5d7ef380e75add463b37574fdcc8b (patch) | |
| tree | 0e97578072574d3c971c5c225289f13118e80a50 /pkgs/top-level/splice.nix | |
| parent | 49f175cd0c80a39e1d05fc687c4a2a40e0aba58c (diff) | |
| parent | dbd500937644c2deae4a2c7a59f4a11a006bf1d0 (diff) | |
| download | nixpkgs-c3af1210b4c5d7ef380e75add463b37574fdcc8b.tar nixpkgs-c3af1210b4c5d7ef380e75add463b37574fdcc8b.tar.gz nixpkgs-c3af1210b4c5d7ef380e75add463b37574fdcc8b.tar.bz2 nixpkgs-c3af1210b4c5d7ef380e75add463b37574fdcc8b.tar.lz nixpkgs-c3af1210b4c5d7ef380e75add463b37574fdcc8b.tar.xz nixpkgs-c3af1210b4c5d7ef380e75add463b37574fdcc8b.tar.zst nixpkgs-c3af1210b4c5d7ef380e75add463b37574fdcc8b.zip | |
Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs
Diffstat (limited to 'pkgs/top-level/splice.nix')
| -rw-r--r-- | pkgs/top-level/splice.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 44a46b7b692..d6498be949b 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -80,7 +80,11 @@ in # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below). callPackage = pkgs.newScope {}; + callPackageWithOutput = pkgs.newScopeWithOutput {}; + callPackages = lib.callPackagesWith splicedPackages; newScope = extra: lib.callPackageWith (splicedPackages // extra); + + newScopeWithOutput = extra: lib.callPackageWithOutputWith (splicedPackages // extra); } |