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/development/tools/xcbuild | |
| parent | 724e833ea2a9d1b16f7289e1244d0d7ff56d027b (diff) | |
xcbuild: use llvm6-based xcbuild
Diffstat (limited to 'pkgs/development/tools/xcbuild')
| -rw-r--r-- | pkgs/development/tools/xcbuild/wrapper.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 959c79405e861..902d210405018 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; }; |