diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-04-29 11:37:51 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-04-29 22:29:24 +0200 |
| commit | cbfbd01cd7a483562930a03b4ae6e8647307a199 (patch) | |
| tree | 0a5cc25f3ec4361315dbb732d7cea29f39aa4bf1 /pkgs/development/web | |
| parent | 7896a84849284e2bd274632691eb1f2f97aecaaf (diff) | |
| download | nixlib-cbfbd01cd7a483562930a03b4ae6e8647307a199.tar nixlib-cbfbd01cd7a483562930a03b4ae6e8647307a199.tar.gz nixlib-cbfbd01cd7a483562930a03b4ae6e8647307a199.tar.bz2 nixlib-cbfbd01cd7a483562930a03b4ae6e8647307a199.tar.lz nixlib-cbfbd01cd7a483562930a03b4ae6e8647307a199.tar.xz nixlib-cbfbd01cd7a483562930a03b4ae6e8647307a199.tar.zst nixlib-cbfbd01cd7a483562930a03b4ae6e8647307a199.zip | |
nodejs: fix on i686-linux
Fixes this:
creating ./config.gypi
creating ./config.mk
building
make flags: SHELL=/nix/store/fp0nwhj932kscakw1gbnlmmk8pdfv9sq-bash-4.2-p45/bin/bash
building out/Makefile
/nix/store/vh2zy8l2797yl3mri35y8jnhc81w9hm1-python-2.7.6/bin/python tools/gyp_node.py -f make
/bin/sh: which: command not found
gyp: Call to '(echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true' returned exit status 0.
make: *** [out/Makefile] Error 1
[Bjørn: add build error to commit message.]
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/nodejs/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 9cbd7c46b52e..44a7890e21fe 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares, pkgconfig, runCommand }: +{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares, pkgconfig, runCommand, which }: let dtrace = runCommand "dtrace-native" {} '' @@ -45,7 +45,7 @@ in stdenv.mkDerivation { (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch}) '' else null; - buildInputs = [ python ] + buildInputs = [ python which ] ++ (optional stdenv.isLinux utillinux) ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ]; setupHook = ./setup-hook.sh; |