nodejs*: use older openssl

nodejs v9 seems the only one supporting 1.1.0. This kind of package seems relatively safe to use another version of a library.
NixOS · Feb 11, 2018 · 63c5c8a · 63c5c8a
1 parent 5bc89ca
commit 63c5c8a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix
@@ -13,7 +13,7 @@ nodePackages // {
   dnschain =  nodePackages.dnschain.override (oldAttrs: {
     buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ];
     postInstall = ''
-      wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
+      wrapProgram $out/bin/dnschain --suffix PATH : ${nodejs.openssl.bin}/bin
     '';
   });
 

diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
@@ -13,7 +13,7 @@ nodePackages // {
   dnschain =  nodePackages.dnschain.override (oldAttrs: {
     buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ];
     postInstall = ''
-      wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
+      wrapProgram $out/bin/dnschain --suffix PATH : ${nodejs.openssl.bin}/bin
     '';
   });
 

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
@@ -50,8 +50,6 @@ in
 
     enableParallelBuilding = true;
 
-    passthru.interpreterName = "nodejs";
-
     setupHook = ./setup-hook.sh;
 
     inherit patches;
@@ -84,5 +82,9 @@ in
       platforms = platforms.linux ++ platforms.darwin;
     };
 
-    passthru.python = python2; # to ensure nodeEnv uses the same version
+    passthru = {
+      interpreterName = "nodejs";
+      python = python2; # to ensure nodeEnv uses the same version
+      inherit openssl;
+    };
 }
diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
@@ -1,7 +1,7 @@
-{ stdenv, callPackage, lib, enableNpm ? true }:
+{ stdenv, callPackage, lib, enableNpm ? true, openssl_1_0_2 }:
 
 let
-  buildNodejs = callPackage ./nodejs.nix {};
+  buildNodejs = callPackage ./nodejs.nix { openssl = openssl_1_0_2; };
 in
   buildNodejs {
     inherit enableNpm;

diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
@@ -1,7 +1,7 @@
-{ stdenv, callPackage, lib, enableNpm ? true }:
+{ stdenv, callPackage, lib, enableNpm ? true, openssl_1_0_2 }:
 
 let
-  buildNodejs = callPackage ./nodejs.nix {};
+  buildNodejs = callPackage ./nodejs.nix { openssl = openssl_1_0_2; };
 in
   buildNodejs {
     inherit enableNpm;

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
@@ -1,7 +1,7 @@
-{ stdenv, callPackage, lib, enableNpm ? true }:
+{ stdenv, callPackage, lib, enableNpm ? true, openssl_1_0_2 }:
 
 let
-  buildNodejs = callPackage ./nodejs.nix {};
+  buildNodejs = callPackage ./nodejs.nix { openssl = openssl_1_0_2; };
 in
   buildNodejs {
     inherit enableNpm;