summary refs log tree commit diff
path: root/pkgs/development/tools/xcbuild
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2017-04-12 05:20:33 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2017-04-12 05:20:33 -0500
commit3d1d805245c1b0788e1ce4a01d8455e30ac15739 (patch)
tree06152ab97bd6e662f3822063e770d26b12f129ed /pkgs/development/tools/xcbuild
parent1781ec934f5a815d13b768a77a4bde8798db26d3 (diff)
downloadnixlib-3d1d805245c1b0788e1ce4a01d8455e30ac15739.tar
nixlib-3d1d805245c1b0788e1ce4a01d8455e30ac15739.tar.gz
nixlib-3d1d805245c1b0788e1ce4a01d8455e30ac15739.tar.bz2
nixlib-3d1d805245c1b0788e1ce4a01d8455e30ac15739.tar.lz
nixlib-3d1d805245c1b0788e1ce4a01d8455e30ac15739.tar.xz
nixlib-3d1d805245c1b0788e1ce4a01d8455e30ac15739.tar.zst
nixlib-3d1d805245c1b0788e1ce4a01d8455e30ac15739.zip
Revert "xcbuild: try to fix sdk not found"
This reverts commit 87e6b2c50fb4520d9ef910418f3c686d830dc3df.
Diffstat (limited to 'pkgs/development/tools/xcbuild')
-rw-r--r--pkgs/development/tools/xcbuild/platform.nix2
-rw-r--r--pkgs/development/tools/xcbuild/wrapper.nix4
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix
index cacf9467356b..31692d9bee68 100644
--- a/pkgs/development/tools/xcbuild/platform.nix
+++ b/pkgs/development/tools/xcbuild/platform.nix
@@ -228,6 +228,6 @@ stdenv.mkDerivation {
 
     mkdir -p $out/Developer/SDKs/
     cd $out/Developer/SDKs/
-    ln -s ${sdk} macosx10.10.sdk
+    ln -s ${sdk}
   '';
 }
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index 3dfc7f363439..ab6605e91b10 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -60,13 +60,9 @@ 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;