diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
| commit | 6602f49495c94e8533c8b482698bcf570a8d8933 (patch) | |
| tree | 07065424002052ed9e726b4feb689697845ff4a7 /pkgs/development/web/nodejs/default.nix | |
| parent | e4feccce818416c39c8e86e6f9ac01674ad98c88 (diff) | |
| download | nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.gz nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.bz2 nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.lz nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.xz nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.zst nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.zip | |
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes.
Diffstat (limited to 'pkgs/development/web/nodejs/default.nix')
| -rw-r--r-- | pkgs/development/web/nodejs/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 1bd8dbec1e6c..2a4a7244d4d6 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -38,12 +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.optional stdenv.isDarwin ./no-xcode.patch; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ]; - buildInputs = [ python which http-parser zlib libuv openssl python ] - ++ (optional stdenv.isLinux utillinux) + buildInputs = [ python which zlib libuv openssl python ] + ++ optionals stdenv.isLinux [ utillinux http-parser ] ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ]; setupHook = ./setup-hook.sh; |