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

merge the rest of multiple-outputs

Browse Source 
Conflicts:
	pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
	pkgs/development/tools/misc/patchelf/default.nix (easy)
	pkgs/stdenv/generic/setup.sh (previous merge taken)
This commit is contained in:
Vladimír Čunát
2014-08-25 10:40:57 +02:00
parent c96f4d7949 a835b282fe
commit 77da5efc78
56 changed files with 398 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,9 +45,9 @@ in stdenv.mkDerivation {
(cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
'' else null;
buildInputs = [ python which ]
buildInputs = [ python openssl ]
++ (optional stdenv.isLinux utillinux)
++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ];
++ optionals stdenv.isDarwin [ pkgconfig dtrace ];
setupHook = ./setup-hook.sh;
meta = {