diff options
| author | Renzo Carbonara <gnuk0001@gmail.com> | 2017-02-09 00:22:11 +0100 |
|---|---|---|
| committer | Renzo Carbonara <gnuk0001@gmail.com> | 2017-02-09 00:22:47 +0100 |
| commit | 1684c9a6a09f96af57301a14566e8f7c2020e40d (patch) | |
| tree | bb62cada6834eabb787fce1faf402c4b91756be3 /pkgs/development/compilers/ghcjs | |
| parent | 4494b18fe44c187f493d7be82c1b86fb8d4288a4 (diff) | |
| download | nixlib-1684c9a6a09f96af57301a14566e8f7c2020e40d.tar nixlib-1684c9a6a09f96af57301a14566e8f7c2020e40d.tar.gz nixlib-1684c9a6a09f96af57301a14566e8f7c2020e40d.tar.bz2 nixlib-1684c9a6a09f96af57301a14566e8f7c2020e40d.tar.lz nixlib-1684c9a6a09f96af57301a14566e8f7c2020e40d.tar.xz nixlib-1684c9a6a09f96af57301a14566e8f7c2020e40d.tar.zst nixlib-1684c9a6a09f96af57301a14566e8f7c2020e40d.zip | |
compilers/ghcjs/base.nix: Take ghcjsNodePkgs as argument
Diffstat (limited to 'pkgs/development/compilers/ghcjs')
| -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 393278be49ef..f548db5def30 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -39,6 +39,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"; @@ -160,12 +165,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; |