diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2017-10-10 20:29:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-10 20:29:07 -0400 |
| commit | 71e0dbdf0ce02c8bd0808a7b1153679d2068421f (patch) | |
| tree | 64e2d587bdfd6241a2463146307a15beed048c6e /pkgs/development | |
| parent | d4142e17eff0cab16b7b99e92466b841fd2c77c0 (diff) | |
| parent | f92e097cd4cfdba43f38a25f858ac15c5d9da44d (diff) | |
| download | nixpkgs-71e0dbdf0ce02c8bd0808a7b1153679d2068421f.tar nixpkgs-71e0dbdf0ce02c8bd0808a7b1153679d2068421f.tar.gz nixpkgs-71e0dbdf0ce02c8bd0808a7b1153679d2068421f.tar.bz2 nixpkgs-71e0dbdf0ce02c8bd0808a7b1153679d2068421f.tar.lz nixpkgs-71e0dbdf0ce02c8bd0808a7b1153679d2068421f.tar.xz nixpkgs-71e0dbdf0ce02c8bd0808a7b1153679d2068421f.tar.zst nixpkgs-71e0dbdf0ce02c8bd0808a7b1153679d2068421f.zip | |
Merge pull request #30299 from copumpkin/xcbuild-sdk
xcbuild: add SDKROOT by default to the wrappers
Diffstat (limited to 'pkgs/development')
| -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 ab6605e91b1..2f6b42e7a00 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; |