From fffc0c793c68c2c48bce9d67cd602372becdcfbd Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 25 Jan 2015 01:41:39 +0100
Subject: [PATCH] nodePackages: fix back compatibility

---
 pkgs/development/web/nodejs/build-node-package.nix | 6 +++---
 pkgs/top-level/node-packages.nix                   | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 729ee8b9365..af997f19e8d 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -3,6 +3,9 @@
 {
   name, src,
 
+  # Node package name
+  pkgName ? (builtins.parseDrvName name).name,
+
   # List or attribute set of dependencies
   deps ? {},
 
@@ -38,9 +41,6 @@ let
     mv *node* $out
   '';
 
-  # Package name without version
-  pkgName = (builtins.parseDrvName name).name;
-
   # Convert deps to attribute set
   attrDeps = if isAttrs deps then deps else
     (listToAttrs (map (dep: nameValuePair dep.name dep) deps));
diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index 9314112ad3d..ae0b7dac59c 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -37,11 +37,12 @@ rec {
       pkgs.callPackage ../development/web/nodejs/build-node-package.nix {
         inherit nodejs neededNatives;
       }
-    ) (args // {
+    ) (args // (optionalAttrs (isList args.src) {
       # Backwards compatibility
-      src = if isList args.src then head args.src else args.src;
-      pkgName = (builtins.parseDrvName args.name).name;
-    });
+      src = head args.src;
+    }) // (optionalAttrs (attrByPath ["passthru" "names"] null args != null) {
+       pkgName = head args.passthru.names;
+    }));
 
     override = overrides.${args.name} or overrides.${pkg.pkgName} or {};