public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodejs: fix gyp errors when building scuttlebot on Darwin (#57632)

Browse Source 
* nodejs: fix gyp errors when building scuttlebot

* nodejs-slim: fix build on Darwin
This commit is contained in:
jacereda 2019-03-15 20:23:50 +01:00 committed by Matthew Bauer
parent 611266a356
commit 412a25e74b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/web/nodejs/nodejs.nix
View File

@ -72,7 +72,6 @@ in
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
# fix tests # fix tests
for a in test/parallel/test-child-process-env.js \ for a in test/parallel/test-child-process-env.js \
@ -84,6 +83,7 @@ in
--replace "/usr/bin/env" "${coreutils}/bin/env" --replace "/usr/bin/env" "${coreutils}/bin/env"
done done
'' + optionalString stdenv.isDarwin '' '' + optionalString stdenv.isDarwin ''
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
sed -i -e "s|tr1/type_traits|type_traits|g" \ sed -i -e "s|tr1/type_traits|type_traits|g" \
-e "s|std::tr1|std|" src/util.h -e "s|std::tr1|std|" src/util.h
''; '';
@ -101,6 +101,8 @@ in
# install the missing headers for node-gyp # install the missing headers for node-gyp
cp -r ${concatStringsSep " " copyLibHeaders} $out/include/node cp -r ${concatStringsSep " " copyLibHeaders} $out/include/node
'' + optionalString (stdenv.isDarwin && enableNpm) ''
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
''; '';
passthru.updateScript = import ./update.nix { passthru.updateScript = import ./update.nix {