WIP: treewide: splice more nested package sets

So far this just has some functions that might come in handy. Next step is to find package sets that provide things used as non-buildInputs (most of them seem to not fit that?). I've always hated this splicing monster. Maybe others can tell me where this might be worth it. CC @FRidh @globin
NixOS · Nov 29, 2020 · 358d628 · 358d628
1 parent 2868e69
commit 358d628
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/lib/customisation.nix b/lib/customisation.nix
@@ -231,6 +231,7 @@ rec {
       } // keep self;
       self = f self // {
         newScope = scope: newScope (spliced // scope);
+        makeScopeWithSplicing = makeScopeWithSplicing splicePackages self.newScope;
         callPackage = newScope spliced; # == self.newScope {};
         # N.B. the other stages of the package set spliced in are *not*
         # overridden.

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
@@ -69,9 +69,7 @@ with pkgs;
               recursivePthLoader
             ;
           };
-        in lib.makeScopeWithSplicing
-          pkgs.splicePackages
-          pkgs.newScope
+        in pkgs.makeScopeWithSplicing
           otherSplices
           keep
           (lib.extends overrides pythonPackagesFun))

diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
@@ -131,6 +131,17 @@ in
 
   newScope = extra: lib.callPackageWith (splicedPackagesWithXorg // extra);
 
+  makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope;
+
+  topProjectedSpliced = attr: {
+    selfBuildBuild   = pkgs.pkgsBuildBuild.${attr};
+    selfBuildHost    = pkgs.pkgsBuildHost.${attr};
+    selfBuildTarget  = pkgs.pkgsBuildTarget.${attr};
+    selfHostHost     = pkgs.pkgsHostHost.${attr};
+    selfHostTarget   = pkgs.pkgsHostTarget.${attr};
+    selfTargetTarget = pkgs.pkgsTargetTarget.${attr} or {};
+  };
+
   # Haskell package sets need this because they reimplement their own
   # `newScope`.
   __splicedPackages = splicedPackages // { recurseForDerivations = false; };