add nix-xcode meta

lib/maintainers.nix

@@ -152,7 +152,6 @@
   joachifm = "Joachim Fasting <joachifm@fastmail.fm>";
   joamaki = "Jussi Maki <joamaki@gmail.com>";
   joelmo = "Joel Moberg <joel.moberg@gmail.com>";
-  joelteon = "Joel Taylor <me@joelt.io>";
   jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
   jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
@@ -239,6 +238,7 @@
   phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
   phunehehe = "Hoang Xuan Phu <phunehehe@gmail.com>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
+  pikajude = "Jude Taylor <me@jude.bio>";
   piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
   pjbarnoy = "Perry Barnoy <pjbarnoy@gmail.com>";
   pjones = "Peter Jones <pjones@devalot.com>";

pkgs/development/tools/nix-xcode/default.nix

@@ -0,0 +1,44 @@
+{ stdenv, callPackage, runCommand, buildEnv, substituteAll, which }:
+
+let
+  script = s: substituteAll {
+    src = s;
+    isExecutable = true;
+    inherit (stdenv) libc;
+    inherit which;
+    sdk = fakeSdk;
+  };
+
+  fakeSdk = runCommand "fake-sdk" {} ''
+    mkdir -p $out/MacOSX10.10.sdk
+    cat >$out/MacOSX10.10.sdk/SDKSettings.plist <<EOF
+    <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+    <plist version="1.0">
+    <dict>
+      <key>DefaultProperties</key>
+      <dict>
+        <key>PLATFORM_NAME</key>
+        <string>macosx</string>
+      </dict>
+    </dict>
+    </plist>
+    EOF
+  '';
+
+in stdenv.mkDerivation {
+  name = "nix-xcode-1.0";
+  setupHook = ./setup-hook.sh;
+  unpackPhase = ":";
+  installPhase = ''
+    mkdir -p $out/bin
+    ln -s ${script ./pkgutil.sh} $out/bin/pkgutil
+    ln -s ${script ./xcode-select.sh} $out/bin/xcode-select
+    ln -s ${script ./xcrun.sh} $out/bin/xcrun
+    ln -s ${script ./xcodebuild.sh} $out/bin/xcodebuild
+  '';
+
+  meta = with stdenv.lib; {
+    maintainers = [ maintainers.pikajude ];
+    platforms = platforms.darwin;
+  };
+}

pkgs/development/tools/nix-xcode/pkgutil.sh

@@ -0,0 +1,23 @@
+#!@shell@
+echo >&2 "fake-pkgutil: $@"
+
+args=()
+
+if [ "$1" = "--pkg-info" ]; then
+  if [ "$2" = "com.apple.pkg.CLTools_Executables" ]; then
+    cat <<EOF
+package-id: com.apple.pkg.CLTools_Executables
+version: 7.2.0.0.1.1447826929
+volume: /
+location: /
+install-time: 1449620505
+groups: com.apple.FindSystemFiles.pkg-group com.apple.DevToolsBoth.pkg-group com.apple.DevToolsNonRelocatableShared.pkg-group
+EOF
+  else
+    echo >&2 "fake-pkgutil: --pkg-info for unknown package requested"
+    exit 1
+  fi
+else
+  echo >&2 "fake-pkgutil: unknown arguments"
+  exit 1
+fi

pkgs/development/tools/nix-xcode/setup-hook.sh

@@ -0,0 +1,17 @@
+fooPhase() {
+  echo >&2 "patching references to Xcode utilities..."
+
+  PATTERN="(/usr/bin/xcrun|/usr/bin/xcode-select|/usr/bin/xcodebuild|/usr/sbin/pkgutil)"
+
+  while IFS= read -r fname
+  do
+    echo "patching $fname"
+    substituteInPlace "$fname" \
+      --replace "/usr/bin/xcrun" "@out@/bin/xcrun" \
+      --replace "/usr/bin/xcode-select" "@out@/bin/xcode-select" \
+      --replace "/usr/sbin/pkgutil" "@out@/bin/pkgutil" \
+      --replace "/usr/bin/xcodebuild" "@out@/bin/xcodebuild"
+  done < <(grep -Rl -E "$PATTERN" .)
+}
+
+preConfigureHooks+=(fooPhase)

pkgs/development/tools/nix-xcode/xcode-select.sh

@@ -0,0 +1,14 @@
+#!@shell@
+
+echo >&2 "fake-xcode-select: $@"
+
+case "$1" in
+  --print-path)
+    echo "@libc@"
+    exit
+    ;;
+  *)
+    echo >&2 "fake-xcode-select: unknown args"
+    exit 1
+    ;;
+esac

pkgs/development/tools/nix-xcode/xcodebuild.sh

@@ -0,0 +1,36 @@
+#!@shell@
+
+echo >&2 "fake-xcodebuild: $@"
+
+read -r -d '' versionFull <<'EOF'
+MacOSX10.10.sdk - OS X 10.10 (macosx10.10)
+SDKVersion: 10.10
+Path: @sdk@/MacOSX10.10.sdk
+PlatformVersion: 1.1
+PlatformPath: @sdk@
+ProductBuildVersion: 15E27c
+ProductCopyright: 1983-2016 Apple Inc.
+ProductName: Mac OS X
+ProductUserVisibleVersion: 10.10.1
+ProductVersion: 10.10.1
+EOF
+
+while (("$#")); do
+  case "$1" in
+    -sdk) shift;;
+
+    -version)
+      case "$2" in
+        -*|"")
+          echo "$versionFull"
+          exit
+          ;;
+        *)
+          echo "$versionFull" | grep "^$2" | cut -d: -f2 | cut -c2-
+          exit
+          ;;
+      esac
+      ;;
+  esac
+  shift
+done

pkgs/development/tools/nix-xcode/xcrun.sh

@@ -0,0 +1,29 @@
+#!@shell@
+
+echo >&2 "fake-xcrun: $@"
+
+args=()
+
+while (("$#")); do
+  case "$1" in
+    # glorified `which'
+    -find)
+      shift
+      args+=(@which@/bin/which "$1")
+      ;;
+
+    # example: -sdk macosx
+    # this argument is always useless to us
+    -sdk) shift;;
+
+    # bare arguments
+    # example: xcrun clang -v
+    *) args+=("$1");;
+  esac
+  shift
+done
+
+if [ "${#args[@]}" -gt "0" ]; then
+  echo >&2 "fake-xcrun: executing ${args[@]}"
+  exec "${args[@]}"
+fi

pkgs/development/tools/phantomjs2/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl,
   bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg, libpng, perl, python, ruby, sqlite,
-  darwin, writeScriptBin, cups
+  darwin, writeScriptBin, cups, nix-xcode
 }:
 
 let
@@ -44,6 +44,7 @@ in stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
       AGL ApplicationServices AppKit Cocoa OpenGL
       darwin.libobjc fakeClang cups
+      nix-xcode
     ]);
 
 
@@ -57,26 +58,13 @@ in stdenv.mkDerivation rec {
     sed -i 88d src/qt/qtwebkit/Tools/qmake/mkspecs/features/features.prf
     echo 'CONFIG -= create_cmake' >> src/qt/qtwebkit/Source/api.pri
     echo 'CONFIG -= create_cmake' >> src/qt/qtwebkit/Source/widgetsapi.pri
-    pushd src/qt
-
-      substituteInPlace qtbase/configure \
-        --replace /usr/bin/xcode-select true \
-        --replace '/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null' 'echo /var/empty' \
-        --replace '/usr/bin/xcrun -sdk $sdk -find' 'type -P'
-      substituteInPlace qtbase/mkspecs/features/mac/default_pre.prf \
-        --replace '/usr/bin/xcode-select --print-path 2>/dev/null' "echo ${stdenv.libc}" \
-        --replace '/usr/bin/xcrun -find xcrun 2>/dev/null' 'echo success' \
-        --replace '/usr/bin/xcodebuild -version' 'echo Xcode 7.2; echo Build version 7C68' \
-        --replace 'sdk rez' ""
-      for file in $(grep -rl /usr/bin/xcrun .); do
-        substituteInPlace "$file" --replace "/usr/bin/xcrun" ${fakeXcrun}/bin/xcrun
-      done
-      substituteInPlace qtbase/src/tools/qlalr/lalr.cpp --replace _Nullable Nullable
-
-    popd
+    substituteInPlace src/qt/qtbase/src/tools/qlalr/lalr.cpp --replace _Nullable Nullable
   '';
 
-  __impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib";
+  __impureHostDeps = stdenv.lib.optionals stdenv.isDarwin [
+    "/usr/lib/libicucore.dylib"
+    "/usr/libexec/PlistBuddy"
+  ];
 
   buildPhase = "./build.sh --confirm";
 

pkgs/development/web/nodejs/v0_10.nix

@@ -3,6 +3,7 @@
 
 # apple frameworks
 , CoreServices, ApplicationServices, Carbon, Foundation
+, nix-xcode
 }:
 
 let
@@ -40,30 +41,21 @@ in stdenv.mkDerivation {
 
   prePatch = ''
     patchShebangs .
-    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
-    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
   '';
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./default-arch.patch ./no-xcode.patch ];
-
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
   '';
 
   buildInputs = [ python which ]
     ++ (optional stdenv.isLinux utillinux)
-    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool CoreServices ApplicationServices Foundation ];
+    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool CoreServices
+    ApplicationServices Foundation nix-xcode ];
   propagatedBuildInputs = optionals stdenv.isDarwin [ Carbon ];
   setupHook = ./setup-hook.sh;
 
   enableParallelBuilding = true;
 
-  postFixup = ''
-    pushd $out/lib/node_modules/npm/node_modules/node-gyp
-    patch -p2 < ${./no-xcode.patch}
-    popd
-  '';
-
   passthru.interpreterName = "nodejs-0.10";
 
   meta = {

pkgs/development/web/nodejs/v4.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool
+, pkgconfig, runCommand, which, libtool, nix-xcode
 }:
 
 # nodejs 0.12 can't be built on armv5tel. Armv6 with FPU, minimum I think.
@@ -38,18 +38,13 @@ in stdenv.mkDerivation {
   dontDisableStatic = true;
   prePatch = ''
     patchShebangs .
-    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
   '';
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ];
-
-  postFixup = ''
-    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' $out/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
-  '';
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./pkg-libpath.patch ];
 
   buildInputs = [ python which zlib libuv openssl python ]
     ++ optionals stdenv.isLinux [ utillinux http-parser ]
-    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];
+    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool nix-xcode ];
   setupHook = ./setup-hook.sh;
 
   enableParallelBuilding = true;

pkgs/development/web/nodejs/v5.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool
+, pkgconfig, runCommand, which, libtool, nix-xcode
 }:
 
 # nodejs 5.0.0 can't be built on armv5tel. Armv6 with FPU, minimum I think.
@@ -42,7 +42,7 @@ in stdenv.mkDerivation {
 
   buildInputs = [ python which zlib libuv openssl python ]
     ++ optionals stdenv.isLinux [ utillinux http-parser ]
-    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];
+    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool nix-xcode ];
   setupHook = ./setup-hook.sh;
 
   enableParallelBuilding = true;

pkgs/top-level/all-packages.nix

@@ -5899,6 +5899,8 @@ let
       pythonPackages = python3Packages;
   };
 
+  nix-xcode = callPackage ../development/tools/nix-xcode { };
+
   node_webkit = node_webkit_0_9;
 
   nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix {