From 3d1d805245c1b0788e1ce4a01d8455e30ac15739 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 12 Apr 2017 05:20:33 -0500 Subject: [PATCH] Revert "xcbuild: try to fix sdk not found" This reverts commit 87e6b2c50fb4520d9ef910418f3c686d830dc3df. --- pkgs/development/tools/xcbuild/platform.nix | 2 +- pkgs/development/tools/xcbuild/wrapper.nix | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index cacf9467356..31692d9bee6 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 3dfc7f36343..ab6605e91b1 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;