From 03621d4cd8ff005342363148b81050af86f77888 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 7 Jan 2013 17:01:50 +0100 Subject: [PATCH] Remove my darwin workarounds for node.js --- pkgs/development/libraries/v8/default.nix | 1 - pkgs/development/web/nodejs/default.nix | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 34026806a52a..1fd6179183fd 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { }; configurePhase = '' - ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "export PATH=/usr/bin:$PATH"} mkdir build/gyp ln -sv ${gyp}/bin/gyp build/gyp/gyp ''; diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 4e00e39fc3d5..42fad7d7deb4 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -12,18 +12,15 @@ 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; prePatch = '' - 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 + sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure ''; postInstall = ''