diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-08-14 02:49:53 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-08-14 02:51:10 +0300 |
| commit | cbc8aa437c44c510b54c664364dbfbcd98ac5f18 (patch) | |
| tree | ae1007b5847b91704edd9ab87458d8b5c3374f11 /pkgs/top-level/darwin-packages.nix | |
| parent | a1fdbae706c846f01c31bbe02cb8246fa348b480 (diff) | |
treewide: use uncurried version of makeScopeWithSplicing
Diffstat (limited to 'pkgs/top-level/darwin-packages.nix')
| -rw-r--r-- | pkgs/top-level/darwin-packages.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index ef4240955b9c6..79764a8133ab2 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -1,6 +1,6 @@ { lib , buildPackages, pkgs, targetPackages -, generateSplicesForMkScope, makeScopeWithSplicing +, generateSplicesForMkScope, makeScopeWithSplicing' , stdenv , preLibcCrossHeaders , config @@ -15,7 +15,10 @@ let (stdenv.targetPlatform.config + "-"); in -makeScopeWithSplicing (generateSplicesForMkScope "darwin") (_: {}) (spliced: spliced.apple_sdk.frameworks) (self: let +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "darwin"; + extra = spliced: spliced.apple_sdk.frameworks; + f = (self: let inherit (self) mkDerivation callPackage; # Must use pkgs.callPackage to avoid infinite recursion. @@ -251,4 +254,5 @@ impure-cmds // appleSourcePackages // chooseLibs // { } // lib.optionalAttrs config.allowAliases { builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06 -}) +}); +} |