From 42da3759a21c64306fc17b658cf7052a5fca97a6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 25 Jul 2012 17:53:02 -0400 Subject: [PATCH] Remove the 'with pkgs;' from node-packages.nix. Packages depending on non-node packages should refer to their deps with pkgs.name --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/node-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ceb8dceb34..fe8604fbed0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -974,7 +974,7 @@ let nodejs = callPackage ../development/web/nodejs {}; nodePackages = recurseIntoAttrs (import ./node-packages.nix { - inherit pkgs stdenv nodejs; + inherit pkgs stdenv nodejs fetchurl; }); ldns = callPackage ../development/libraries/ldns { }; diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 1787b2e31d8..d263e68981a 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -1,11 +1,9 @@ -{ pkgs, stdenv, nodejs }: +{ pkgs, stdenv, nodejs, fetchurl }: let buildNodePackage = import ../development/web/nodejs/build-node-package.nix { inherit stdenv nodejs; }; in -with pkgs; - let self = { "coffee-script" = self."coffee-script-1.3.3";