mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-05-18 03:36:03 +00:00
Code Issues Wiki Activity

node-packages.nix: Actually use nativeDeps

Browse source 
Wonder how long that's been broken...

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-07-27 13:33:18 -04:00
parent 93cdc526c3
commit 2762b0667d
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/top-level/node-packages.nix
View file

@ -5,6 +5,15 @@ let
importGeneratedPackages = generated: nativeDeps: self: importGeneratedPackages = generated: nativeDeps: self:
let let
nativeDepsList = { name, spec, ... }:
let
nameOr = if builtins.hasAttr name nativeDeps
then builtins.getAttr name nativeDeps
else {};
depsOr = if builtins.hasAttr spec nameOr
then builtins.getAttr spec nameOr
else [];
in depsOr;
all = pkgs.lib.fold (pkg: { top-level, full }: { all = pkgs.lib.fold (pkg: { top-level, full }: {
top-level = top-level ++ pkgs.lib.optional pkg.topLevel { top-level = top-level ++ pkgs.lib.optional pkg.topLevel {
name = pkg.name; name = pkg.name;
@ -25,6 +34,7 @@ let
sha256 = pkg.sha256 or ""; sha256 = pkg.sha256 or "";
}; };
deps = map (dep: builtins.getAttr dep.spec (builtins.getAttr dep.name self.full)) pkg.dependencies; deps = map (dep: builtins.getAttr dep.spec (builtins.getAttr dep.name self.full)) pkg.dependencies;
buildInputs = nativeDepsList pkg;
}; };
} ]; } ];
} ]; } ];
@ -34,8 +44,8 @@ in {
inherit importGeneratedPackages; inherit importGeneratedPackages;
nativeDeps = { nativeDeps = {
"node-expat-*" = [ pkgs.expat ]; "node-expat"."*" = [ pkgs.expat ];
"rbytes-0.0.2" = [ pkgs.openssl ]; "rbytes"."0.0.2" = [ pkgs.openssl ];
}; };
buildNodePackage = import ../development/web/nodejs/build-node-package.nix { buildNodePackage = import ../development/web/nodejs/build-node-package.nix {