diff options
author | Malo Bourgon <mbourgon@gmail.com> | 2023-03-04 10:35:20 +1100 |
---|---|---|
committer | Malo Bourgon <mbourgon@gmail.com> | 2023-03-04 12:38:03 +1100 |
commit | 7a734f279523d08b5eec75a8a60d24438dbbe5cc (patch) | |
tree | 67f372c2ba965702507ed0c53d8215e7730df2ce /pkgs/os-specific | |
parent | 68648fa4c01e5b9f9b91cf0235652bbaec154926 (diff) |
darwin.apple_sdk_11_0: code cleanup
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/darwin/apple-sdk-11.0/default.nix | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index df707e2b6e267..8c9e16a6ca9a9 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -82,25 +82,25 @@ let callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; }); packages = stdenvs // { - inherit (callPackage ./apple_sdk.nix {}) frameworks libs; + inherit (callPackage ./apple_sdk.nix { }) frameworks libs; # TODO: this is nice to be private. is it worth the callPackage above? # Probably, I don't think that callPackage costs much at all. inherit MacOSX-SDK CLTools_Executables; - Libsystem = callPackage ./libSystem.nix {}; + Libsystem = callPackage ./libSystem.nix { }; LibsystemCross = pkgs.darwin.Libsystem; - libcharset = callPackage ./libcharset.nix {}; - libunwind = callPackage ./libunwind.nix {}; - libnetwork = callPackage ./libnetwork.nix {}; - libpm = callPackage ./libpm.nix {}; + libcharset = callPackage ./libcharset.nix { }; + libunwind = callPackage ./libunwind.nix { }; + libnetwork = callPackage ./libnetwork.nix { }; + libpm = callPackage ./libpm.nix { }; # Avoid introducing a new objc4 if stdenv already has one, to prevent # conflicting LLVM modules. - objc4 = if stdenv ? objc4 then stdenv.objc4 else callPackage ./libobjc.nix {}; + objc4 = stdenv.objc4 or (callPackage ./libobjc.nix { }); # questionable aliases configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration; - IOKit = pkgs.darwin.apple_sdk.frameworks.IOKit; + inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; xcodebuild = pkgs.xcbuild.override { inherit (pkgs.darwin.apple_sdk_11_0) stdenv; @@ -115,7 +115,16 @@ let callPackage = newScope (lib.optionalAttrs stdenv.isDarwin (stdenvs // rec { inherit (pkgs.darwin.apple_sdk_11_0) xcodebuild rustPlatform; darwin = pkgs.darwin.overrideScope (_: prev: { - inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; + inherit (prev.darwin.apple_sdk_11_0) + IOKit + Libsystem + LibsystemCross + Security + configd + libcharset + libunwind + objc4 + ; apple_sdk = prev.darwin.apple_sdk_11_0; CF = prev.darwin.apple_sdk_11_0.CoreFoundation; }); |