public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xcbuild: use llvm6-based xcbuild

Browse Source
This commit is contained in:
Matthew Bauer 2019-04-22 22:45:58 -04:00
parent 724e833ea2
commit ecffd43b46
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/tools/xcbuild/wrapper.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand { stdenv, lib, buildPackages, makeWrapper, writeText, runCommand
, CoreServices, ImageIO, CoreGraphics , CoreServices, ImageIO, CoreGraphics
, runtimeShell , runtimeShell, callPackage
, xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX"
, xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" , xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1"
, sdkVer ? stdenv.targetPlatform.sdkVer or "10.10" }: , sdkVer ? stdenv.targetPlatform.sdkVer or "10.10" }:
@ -14,20 +14,20 @@ let
sdkBuildVersion = "17E189"; sdkBuildVersion = "17E189";
xcodeSelectVersion = "2349"; xcodeSelectVersion = "2349";
xcbuild = buildPackages.callPackage ./default.nix { xcbuild = callPackage ./default.nix {
inherit CoreServices ImageIO CoreGraphics; inherit CoreServices ImageIO CoreGraphics stdenv;
}; };
toolchains = buildPackages.callPackage ./toolchains.nix { toolchains = callPackage ./toolchains.nix {
inherit toolchainName; inherit toolchainName stdenv;
}; };
sdks = buildPackages.callPackage ./sdks.nix { sdks = callPackage ./sdks.nix {
inherit toolchainName sdkName xcodePlatform; inherit toolchainName sdkName xcodePlatform;
version = sdkVer; version = sdkVer;
}; };
platforms = buildPackages.callPackage ./platforms.nix { platforms = callPackage ./platforms.nix {
inherit sdks xcodePlatform; inherit sdks xcodePlatform;
}; };

8
pkgs/top-level/all-packages.nix
View File

@ -1280,6 +1280,7 @@ in
contacts = callPackage ../tools/misc/contacts { contacts = callPackage ../tools/misc/contacts {
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; inherit (darwin.apple_sdk.frameworks) Foundation AddressBook;
xcbuildHook = xcbuild6Hook;
}; };
compsize = callPackage ../os-specific/linux/compsize { }; compsize = callPackage ../os-specific/linux/compsize { };
@ -5062,6 +5063,7 @@ in
pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
xcbuildHook = xcbuild6Hook;
}; };
pingtcp = callPackage ../tools/networking/pingtcp { }; pingtcp = callPackage ../tools/networking/pingtcp { };
@ -9533,11 +9535,17 @@ in
xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
}; };
xcodebuild6 = xcodebuild.override { stdenv = llvmPackages_6.stdenv; };
xcbuild = xcodebuild; xcbuild = xcodebuild;
xcbuildHook = makeSetupHook { xcbuildHook = makeSetupHook {
deps = [ xcbuild ]; deps = [ xcbuild ];
} ../development/tools/xcbuild/setup-hook.sh ; } ../development/tools/xcbuild/setup-hook.sh ;
# xcbuild with llvm 6
xcbuild6Hook = makeSetupHook {
deps = [ xcodebuild6 ];
} ../development/tools/xcbuild/setup-hook.sh ;
xcpretty = callPackage ../development/tools/xcpretty { }; xcpretty = callPackage ../development/tools/xcpretty { };
xmlindent = callPackage ../development/web/xmlindent {}; xmlindent = callPackage ../development/web/xmlindent {};