From 60993d7716c51a246935545f7a3e2ce7952e133e Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 23 Feb 2015 13:24:18 +0100
Subject: [PATCH] nodePackages: prefix packages based on interpreter name

---
 pkgs/development/web/iojs/default.nix              | 2 ++
 pkgs/development/web/nodejs/build-node-package.nix | 4 +---
 pkgs/development/web/nodejs/default.nix            | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index fcae52e1d32..631c3305f81 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -24,6 +24,8 @@ in stdenv.mkDerivation {
   buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux);
   setupHook = ../nodejs/setup-hook.sh;
 
+  passthru.interpreterName = "iojs";
+
   meta = {
     description = "A friendly fork of Node.js with an open governance model";
     homepage = https://iojs.org/;
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 4b9e057243c..7d166a87e6a 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -262,9 +262,7 @@ let
 
     passthru.pkgName = pkgName;
   } // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // {
-    name = "${
-      if bin == true then "bin-" else if bin == false then "node-" else ""
-    }${name}";
+    name = "${nodejs.interpreterName}-${name}";
 
     # Run the node setup hook when this package is a build input
     propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ];
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 51abc90c277..53d09178fc9 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, unstableVersion ? false 
+, pkgconfig, runCommand, which, unstableVersion ? false
 }:
 
 let
@@ -54,6 +54,8 @@ in stdenv.mkDerivation {
     ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ];
   setupHook = ./setup-hook.sh;
 
+  passthru.interpreterName = "nodejs";
+
   meta = {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;