diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-22 22:45:58 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 21:55:04 -0400 |
| commit | ecffd43b4688f49ca9bc2996fc6d273806ce6189 (patch) | |
| tree | 73b94f6a7177c5dfd0e07461c303f0b1aa030a3e /pkgs | |
| parent | 724e833ea2a9d1b16f7289e1244d0d7ff56d027b (diff) | |
| download | nixlib-ecffd43b4688f49ca9bc2996fc6d273806ce6189.tar nixlib-ecffd43b4688f49ca9bc2996fc6d273806ce6189.tar.gz nixlib-ecffd43b4688f49ca9bc2996fc6d273806ce6189.tar.bz2 nixlib-ecffd43b4688f49ca9bc2996fc6d273806ce6189.tar.lz nixlib-ecffd43b4688f49ca9bc2996fc6d273806ce6189.tar.xz nixlib-ecffd43b4688f49ca9bc2996fc6d273806ce6189.tar.zst nixlib-ecffd43b4688f49ca9bc2996fc6d273806ce6189.zip | |
xcbuild: use llvm6-based xcbuild
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/xcbuild/wrapper.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 959c79405e86..902d21040501 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPackages, makeWrapper, writeText, runCommand , CoreServices, ImageIO, CoreGraphics -, runtimeShell +, runtimeShell, callPackage , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" , xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" , sdkVer ? stdenv.targetPlatform.sdkVer or "10.10" }: @@ -14,20 +14,20 @@ let sdkBuildVersion = "17E189"; xcodeSelectVersion = "2349"; - xcbuild = buildPackages.callPackage ./default.nix { - inherit CoreServices ImageIO CoreGraphics; + xcbuild = callPackage ./default.nix { + inherit CoreServices ImageIO CoreGraphics stdenv; }; - toolchains = buildPackages.callPackage ./toolchains.nix { - inherit toolchainName; + toolchains = callPackage ./toolchains.nix { + inherit toolchainName stdenv; }; - sdks = buildPackages.callPackage ./sdks.nix { + sdks = callPackage ./sdks.nix { inherit toolchainName sdkName xcodePlatform; version = sdkVer; }; - platforms = buildPackages.callPackage ./platforms.nix { + platforms = callPackage ./platforms.nix { inherit sdks xcodePlatform; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a75b2ecc9ae2..6c0020b61771 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1280,6 +1280,7 @@ in contacts = callPackage ../tools/misc/contacts { inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; + xcbuildHook = xcbuild6Hook; }; compsize = callPackage ../os-specific/linux/compsize { }; @@ -5062,6 +5063,7 @@ in pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa; + xcbuildHook = xcbuild6Hook; }; pingtcp = callPackage ../tools/networking/pingtcp { }; @@ -9533,11 +9535,17 @@ in xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; + xcodebuild6 = xcodebuild.override { stdenv = llvmPackages_6.stdenv; }; xcbuild = xcodebuild; xcbuildHook = makeSetupHook { deps = [ xcbuild ]; } ../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 { }; xmlindent = callPackage ../development/web/xmlindent {}; |