MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #28767 from LnL7/darwin-cleanup

Browse source 
darwin attribute cleanup
This commit is contained in:
Daniel Peebles 2017-08-30 18:09:05 -04:00 committed by GitHub
commit 8c09e207ef
2 changed files with 58 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
pkgs/top-level/all-packages.nix
View file

@ -11837,53 +11837,8 @@ with pkgs;
crda = callPackage ../os-specific/linux/crda { };
darwin = let
apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
in (apple-source-releases // rec {
cctools = callPackage ../os-specific/darwin/cctools/port.nix {
inherit libobjc;
stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv;
inherit maloader;
xctoolchain = xcode.toolchain;
};
cf-private = callPackage ../os-specific/darwin/cf-private {
inherit (apple-source-releases) CF;
inherit osx_private_sdk;
};
maloader = callPackage ../os-specific/darwin/maloader {
inherit opencflite;
};
opencflite = callPackage ../os-specific/darwin/opencflite {};
swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation {};
ios-cross = callPackage ../os-specific/darwin/ios-cross {
inherit (darwin) binutils;
};
xcode = callPackage ../os-specific/darwin/xcode {};
osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk {};
security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool {
Security-framework = darwin.apple_sdk.frameworks.Security;
};
binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; };
apple_sdk = callPackage ../os-specific/darwin/apple-sdk {};
libobjc = apple-source-releases.objc4;
stubs = callPackages ../os-specific/darwin/stubs {};
usr-include = callPackage ../os-specific/darwin/usr-include {};
DarwinTools = callPackage ../os-specific/darwin/DarwinTools {};
});
# Darwin package set
darwin = callPackages ./darwin-packages.nix { };
devicemapper = lvm2;

56
pkgs/top-level/darwin-packages.nix Normal file
View file

@ -0,0 +1,56 @@
{ pkgs, darwin, stdenv, callPackage, callPackages, newScope }:
let
apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
in
(apple-source-releases // {
callPackage = newScope (darwin.apple_sdk.frameworks // darwin);
apple_sdk = callPackage ../os-specific/darwin/apple-sdk { };
binutils = callPackage ../os-specific/darwin/binutils {
inherit (darwin) cctools;
};
cctools = callPackage ../os-specific/darwin/cctools/port.nix {
inherit (darwin) libobjc maloader;
stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
xctoolchain = darwin.xcode.toolchain;
};
cf-private = callPackage ../os-specific/darwin/cf-private {
inherit (apple-source-releases) CF;
inherit (darwin) osx_private_sdk;
};
DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
maloader = callPackage ../os-specific/darwin/maloader {
inherit (darwin) opencflite;
};
ios-cross = callPackage ../os-specific/darwin/ios-cross {
inherit (darwin) binutils;
};
libobjc = apple-source-releases.objc4;
opencflite = callPackage ../os-specific/darwin/opencflite { };
osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk { };
security_tool = darwin.callPackage ../os-specific/darwin/security-tool {
Security-framework = darwin.apple_sdk.frameworks.Security;
};
stubs = callPackages ../os-specific/darwin/stubs { };
swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation { };
usr-include = callPackage ../os-specific/darwin/usr-include { };
xcode = callPackage ../os-specific/darwin/xcode { };
})