diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-10-10 16:41:44 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-10-10 16:41:44 -0400 |
| commit | f92e097cd4cfdba43f38a25f858ac15c5d9da44d (patch) | |
| tree | 7c89bf4ae2ba3c09597cd0c6002de5c78b9a71b7 /pkgs/development/tools/xcbuild | |
| parent | 0f914d2373d8a00106bef211eb5108f06b98247c (diff) | |
| download | nixlib-f92e097cd4cfdba43f38a25f858ac15c5d9da44d.tar nixlib-f92e097cd4cfdba43f38a25f858ac15c5d9da44d.tar.gz nixlib-f92e097cd4cfdba43f38a25f858ac15c5d9da44d.tar.bz2 nixlib-f92e097cd4cfdba43f38a25f858ac15c5d9da44d.tar.lz nixlib-f92e097cd4cfdba43f38a25f858ac15c5d9da44d.tar.xz nixlib-f92e097cd4cfdba43f38a25f858ac15c5d9da44d.tar.zst nixlib-f92e097cd4cfdba43f38a25f858ac15c5d9da44d.zip | |
xcbuild: add SDKROOT by default to the wrappers
This fixes #30269 and lets us do things like `xcrun -find cc`, for example.
Diffstat (limited to 'pkgs/development/tools/xcbuild')
| -rw-r--r-- | pkgs/development/tools/xcbuild/wrapper.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index ab6605e91b10..2f6b42e7a00e 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -58,11 +58,14 @@ stdenv.mkDerivation { wrapProgram $out/bin/xcodebuild \ --add-flags "-xcconfig ${xcconfig}" \ --add-flags "DERIVED_DATA_DIR=." \ - --set DEVELOPER_DIR "$out" + --set DEVELOPER_DIR "$out" \ + --set SDKROOT ${sdkName} wrapProgram $out/bin/xcrun \ - --set DEVELOPER_DIR "$out" + --set DEVELOPER_DIR "$out" \ + --set SDKROOT ${sdkName} wrapProgram $out/bin/xcode-select \ - --set DEVELOPER_DIR "$out" + --set DEVELOPER_DIR "$out" \ + --set SDKROOT ${sdkName} ''; inherit (xcbuild) meta; |