From ecffd43b4688f49ca9bc2996fc6d273806ce6189 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 22 Apr 2019 22:45:58 -0400 Subject: xcbuild: use llvm6-based xcbuild --- pkgs/development/tools/xcbuild/wrapper.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/development/tools') 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; }; -- cgit 1.4.1