nodejs: implement a darwin-specific fix that properly refers to tr1/type_traits

2016-07-14 12:56:45 +00:00 · 2016-07-14 12:56:45 +00:00 · c3ffae4777
commit c3ffae4777
parent c787d2786e
2 changed files with 6 additions and 3 deletions
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@ -2,6 +2,7 @@
 , pkgconfig, runCommand, which, libtool
 , version
 , src
+, preBuild ? ""
 , ...
 }:

@ -25,9 +26,7 @@ let

 in stdenv.mkDerivation {

-  inherit version;
-
-  inherit src;
+  inherit version src preBuild;

  name = "nodejs-${version}";

--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@ -9,4 +9,8 @@ import ./nodejs.nix (args // rec {
    url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
    sha256 = "2dfeeddba750b52a528b38a1c31e35c1fb40b19cf28fbf430c3c8c7a6517005a";
  };
+  preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+    sed -i -e "s|tr1/type_traits|type_traits|g" \
+      -e "s|std::tr1|std|" src/util.h
+  '';
 })