From 10cfe945fed31fef4ee97bddc2df5192eb69da32 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 19 Jan 2017 15:21:00 -0600
Subject: [PATCH] xcbuild: 0ab861ab -> 0.1.1 (#21895)

* xcbuild: add xcode-select wrapper
* xcbuild: update to 0.1.1
---
 pkgs/development/tools/xcbuild/default.nix | 8 +++++---
 pkgs/development/tools/xcbuild/wrapper.nix | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index 3a1b753bf31a..99859ed9640d 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -15,14 +15,14 @@ let
     sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w";
   };
 in stdenv.mkDerivation rec {
-  name    = "xcbuild-${stdenv.lib.substring 0 8 version}";
-  version = "0ab861abcc11185a17d59608f96a015752a6fadc";
+  name    = "xcbuild-${version}";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "xcbuild";
     rev    = version;
-    sha256 = "12h0rn8v0js2vph2pwp5wvcrfkj12nz365i5qxw9miyfn4msnz26";
+    sha256 = "0i98c6lii8r3bgs5gj7div12pxyzjvm4qqzmmzgr7dyhj00qa8r5";
   };
 
   prePatch = ''
@@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
     rmdir $out/usr
   '';
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=strict-aliasing";
+
   buildInputs = [ cmake zlib libxml2 libpng ninja ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ];
 
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index a40a3440d682..0da733b8078e 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -60,7 +60,8 @@ stdenv.mkDerivation {
       --add-flags "DERIVED_DATA_DIR=." \
       --set DEVELOPER_DIR "$out"
     wrapProgram $out/bin/xcrun \
-      --add-flags "-sdk ${sdkName}" \
+      --set DEVELOPER_DIR "$out"
+    wrapProgram $out/bin/xcode-select \
       --set DEVELOPER_DIR "$out"
   '';