diff options
author | Silvan Mosberger <github@infinisil.com> | 2023-07-28 23:04:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-28 23:04:09 +0200 |
commit | a0b8caf3bc21878b22411aaca1979ce60eeebace (patch) | |
tree | a84d8aca3a42347893ede50f2e49377fe6b88f67 /lib/customisation.nix | |
parent | 49b4b4e8725fa0791d3a3c40bd7ea15b5ce7ff8f (diff) |
Revert "lib.customisation: uncurry makeScopeWithSplicing"
Diffstat (limited to 'lib/customisation.nix')
-rw-r--r-- | lib/customisation.nix | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index 5c66169f215f6..a9281b1ab698a 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -279,15 +279,7 @@ rec { /* Like the above, but aims to support cross compilation. It's still ugly, but hopefully it helps a little bit. */ - makeScopeWithSplicing = - { splicePackages - , newScope - }: - { otherSplices - , keep ? (_self: {}) - , extra ? (_spliced0: {}) - , f - }: + makeScopeWithSplicing = splicePackages: newScope: otherSplices: keep: extra: f: let spliced0 = splicePackages { pkgsBuildBuild = otherSplices.selfBuildBuild; @@ -303,11 +295,13 @@ rec { callPackage = newScope spliced; # == self.newScope {}; # N.B. the other stages of the package set spliced in are *not* # overridden. - overrideScope = g: (makeScopeWithSplicing - { inherit splicePackages newScope; } - { inherit otherSplices keep extra; - f = lib.fixedPoints.extends g f; - }); + overrideScope = g: makeScopeWithSplicing + splicePackages + newScope + otherSplices + keep + extra + (lib.fixedPoints.extends g f); packages = f; }; in self; |