pyrox.dev / nixpkgs
lol
fork atom

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

Sander van der Burg c3ffae47 c787d278

+6 -3
unified split
+2 -3
pkgs/development/web/nodejs/nodejs.nix
··· 2 , pkgconfig, runCommand, which, libtool 3 , version 4 , src 5 , ... 6 }: 7 ··· 25 26 in stdenv.mkDerivation { 27 28 - inherit version; 29 - 30 - inherit src; 31 32 name = "nodejs-${version}"; 33
··· 2 , pkgconfig, runCommand, which, libtool 3 , version 4 , src 5 + , preBuild ? "" 6 , ... 7 }: 8 ··· 26 27 in stdenv.mkDerivation { 28 29 + inherit version src preBuild; 30 31 name = "nodejs-${version}"; 32
+4
pkgs/development/web/nodejs/v6.nix
··· 9 url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; 10 sha256 = "2dfeeddba750b52a528b38a1c31e35c1fb40b19cf28fbf430c3c8c7a6517005a"; 11 }; 12 })
··· 9 url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; 10 sha256 = "2dfeeddba750b52a528b38a1c31e35c1fb40b19cf28fbf430c3c8c7a6517005a"; 11 }; 12 + preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' 13 + sed -i -e "s|tr1/type_traits|type_traits|g" \ 14 + -e "s|std::tr1|std|" src/util.h 15 + ''; 16 })