From e8fd9ec0040d9d10a41f4c73e82bc253ffa8bad3 Mon Sep 17 00:00:00 2001 From: rht Date: Sun, 15 Jan 2017 18:47:02 +0400 Subject: [PATCH] fetchBower: fold arg in all-packages into the nix file --- pkgs/build-support/fetchbower/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index fd971d431df88..8340d73c95561 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, bower2nix, cacert }: +{ stdenvNoCC, lib, nodePackages, cacert }: let bowerVersion = version: let @@ -21,8 +21,9 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; + inherit (nodePackages) bower2nix; inherit outputHash; - nativeBuildInputs = [ bower2nix cacert ]; + nativeBuildInputs = [ nodePackages.bower2nix cacert ]; }; in fetchbower diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c5852e2217f7..3413576c86cc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -177,9 +177,7 @@ in etBook = callPackage ../data/fonts/et-book { }; - fetchbower = callPackage ../build-support/fetchbower { - inherit (nodePackages) bower2nix; - }; + fetchbower = callPackage ../build-support/fetchbower { }; fetchbzr = callPackage ../build-support/fetchbzr { };