diff options
| author | Sander van der Burg <sander@conference-compass.com> | 2013-01-07 16:52:42 +0100 |
|---|---|---|
| committer | Sander van der Burg <sander@conference-compass.com> | 2013-01-07 16:52:42 +0100 |
| commit | 5b0ca88d97d005a73a2be38e7a521af70875a718 (patch) | |
| tree | b2eba8467fa5e1ecd1cac6ab8513582651647e44 /pkgs/development/web | |
| parent | a547de1ecb14853487d864f70ad5e6a1cb3ce08d (diff) | |
| download | nixlib-5b0ca88d97d005a73a2be38e7a521af70875a718.tar nixlib-5b0ca88d97d005a73a2be38e7a521af70875a718.tar.gz nixlib-5b0ca88d97d005a73a2be38e7a521af70875a718.tar.bz2 nixlib-5b0ca88d97d005a73a2be38e7a521af70875a718.tar.lz nixlib-5b0ca88d97d005a73a2be38e7a521af70875a718.tar.xz nixlib-5b0ca88d97d005a73a2be38e7a521af70875a718.tar.zst nixlib-5b0ca88d97d005a73a2be38e7a521af70875a718.zip | |
- Added xcodeenv: experimental support to build iOS apps through Nix
- Moved mobile development tools into a separate folder
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/nodejs/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 48d1c3069932..4e00e39fc3d5 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -12,20 +12,23 @@ stdenv.mkDerivation rec { configureFlags = [ "--openssl-includes=${openssl}/include" "--openssl-libpath=${openssl}/lib" - "--shared-v8" - "--shared-v8-includes=${v8}/includes" - "--shared-v8-libpath=${v8}/lib" + #"--shared-v8" + #"--shared-v8-includes=${v8}/includes" + #"--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 = '' - sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure + sed=$(type -p sed) + 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 = '' - sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js + $sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js '' + stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node ''; |