diff options
| author | Domen Kožar <domen@enlambda.com> | 2017-02-27 14:28:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-27 14:28:36 +0100 |
| commit | fe6ebba59c2e3e4560037da20f590bd724aed6fd (patch) | |
| tree | f663aa2dc17d38fed630245537a26b51904355d2 /pkgs/development | |
| parent | ffe935ee8667c46c73c2fbde2aa0c981a03b1fea (diff) | |
| parent | 1684c9a6a09f96af57301a14566e8f7c2020e40d (diff) | |
Merge pull request #22574 from k0001/ghcjs-node
compilers/ghcjs/base.nix: Take ghcjsNodePkgs as argument
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/ghcjs/base.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 130c9995c8de..5ffc6e2720e0 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -40,6 +40,11 @@ , coreutils , libiconv +, ghcjsNodePkgs ? callPackage ../../../top-level/node-packages.nix { + generated = ./node-packages-generated.nix; + self = ghcjsNodePkgs; + } + , version ? "0.2.0" , ghcjsSrc ? fetchFromGitHub { owner = "ghcjs"; @@ -161,12 +166,7 @@ in mkDerivation (rec { --with-gmp-includes ${gmp.dev}/include \ --with-gmp-libraries ${gmp.out}/lib ''; - passthru = let - ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix { - generated = ./node-packages-generated.nix; - self = ghcjsNodePkgs; - }; - in { + passthru = { inherit bootPkgs; isCross = true; isGhcjs = true; |