nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 22:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

splice.nix: improve performance with early cut-off (#350295)

Browse Source
This commit is contained in:
Artturin 2024-10-31 18:42:15 +02:00 committed by GitHub
commit 6977b4cdab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/top-level/splice.nix
View File

@ -128,6 +128,15 @@ let
"packages"
];
packagesWithXorg = pkgs // builtins.removeAttrs pkgs.xorg [
"callPackage"
"newScope"
"overrideScope"
"packages"
];
pkgsForCall = if actuallySplice then splicedPackagesWithXorg else packagesWithXorg;
in
{
@ -138,9 +147,9 @@ in
# `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).
callPackage = pkgs.newScope { };
callPackages = lib.callPackagesWith splicedPackagesWithXorg;
callPackages = lib.callPackagesWith pkgsForCall;
newScope = extra: lib.callPackageWith (splicedPackagesWithXorg // extra);
newScope = extra: lib.callPackageWith (pkgsForCall // extra);
# prefill 2 fields of the function for convenience
makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope;
@ -169,5 +178,5 @@ in
# Haskell package sets need this because they reimplement their own
# `newScope`.
__splicedPackages = splicedPackages // { recurseForDerivations = false; };
__splicedPackages = if actuallySplice then splicedPackages // { recurseForDerivations = false; } else pkgs;
}