summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2017-04-09 04:27:56 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2017-04-09 04:27:56 -0500
commit87e6b2c50fb4520d9ef910418f3c686d830dc3df (patch)
tree731267547e32e4c8d6c0ac4cc624bf077cb01072 /pkgs/development
parent34422f428d583f57b3cbdaf6bbcc1e0ca61662c4 (diff)
downloadnixpkgs-87e6b2c50fb4520d9ef910418f3c686d830dc3df.tar
nixpkgs-87e6b2c50fb4520d9ef910418f3c686d830dc3df.tar.gz
nixpkgs-87e6b2c50fb4520d9ef910418f3c686d830dc3df.tar.bz2
nixpkgs-87e6b2c50fb4520d9ef910418f3c686d830dc3df.tar.lz
nixpkgs-87e6b2c50fb4520d9ef910418f3c686d830dc3df.tar.xz
nixpkgs-87e6b2c50fb4520d9ef910418f3c686d830dc3df.tar.zst
nixpkgs-87e6b2c50fb4520d9ef910418f3c686d830dc3df.zip
xcbuild: try to fix sdk not found
This is an attempt to get rid of the issues with sdk not found in
xcbuild when building pinentry_mac.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/tools/xcbuild/platform.nix2
-rw-r--r--pkgs/development/tools/xcbuild/wrapper.nix4
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix
index a1f4eed8e60..01693ce8e5b 100644
--- a/pkgs/development/tools/xcbuild/platform.nix
+++ b/pkgs/development/tools/xcbuild/platform.nix
@@ -241,6 +241,6 @@ stdenv.mkDerivation {
 
     mkdir -p $out/Developer/SDKs/
     cd $out/Developer/SDKs/
-    ln -s ${sdk}
+    ln -s ${sdk} macosx10.10.sdk
   '';
 }
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index ab6605e91b1..3dfc7f36343 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -60,9 +60,13 @@ stdenv.mkDerivation {
       --add-flags "DERIVED_DATA_DIR=." \
       --set DEVELOPER_DIR "$out"
     wrapProgram $out/bin/xcrun \
+      --add-flags "-sdk macosx10.10" \
       --set DEVELOPER_DIR "$out"
     wrapProgram $out/bin/xcode-select \
       --set DEVELOPER_DIR "$out"
+
+    mkdir -p $out/usr/bin/
+    ln -s $out/bin/xcrun $out/usr/bin/xcrun
   '';
 
   inherit (xcbuild) meta;