From 87e6b2c50fb4520d9ef910418f3c686d830dc3df Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 9 Apr 2017 04:27:56 -0500 Subject: [PATCH] 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. --- pkgs/development/tools/xcbuild/platform.nix | 2 +- pkgs/development/tools/xcbuild/wrapper.nix | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index a1f4eed8e605..01693ce8e5b9 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 ab6605e91b10..3dfc7f363439 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;