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

Remove my darwin workarounds for node.js

Browse Source
This commit is contained in:
Sander van der Burg 2013-01-07 17:01:50 +01:00
parent eecb135cad
commit 03621d4cd8
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/v8/default.nix
View File

@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
}; };
configurePhase = '' configurePhase = ''
${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "export PATH=/usr/bin:$PATH"}
mkdir build/gyp mkdir build/gyp
ln -sv ${gyp}/bin/gyp build/gyp/gyp ln -sv ${gyp}/bin/gyp build/gyp/gyp
''; '';

11
pkgs/development/web/nodejs/default.nix
View File

@ -12,18 +12,15 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--openssl-includes=${openssl}/include" "--openssl-includes=${openssl}/include"
"--openssl-libpath=${openssl}/lib" "--openssl-libpath=${openssl}/lib"
#"--shared-v8" "--shared-v8"
#"--shared-v8-includes=${v8}/includes" "--shared-v8-includes=${v8}/includes"
#"--shared-v8-libpath=${v8}/lib" "--shared-v8-libpath=${v8}/lib"
]; ];
#patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch; #patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;
prePatch = '' prePatch = ''
sed=$(type -p sed) sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure
export PATH=/usr/bin:$PATH
$sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure
''; '';
postInstall = '' postInstall = ''