Merge pull request #22574 from k0001/ghcjs-node
compilers/ghcjs/base.nix: Take ghcjsNodePkgs as argument
This commit is contained in:
commit
fe6ebba59c
|
@ -40,6 +40,11 @@
|
||||||
, coreutils
|
, coreutils
|
||||||
, libiconv
|
, libiconv
|
||||||
|
|
||||||
|
, ghcjsNodePkgs ? callPackage ../../../top-level/node-packages.nix {
|
||||||
|
generated = ./node-packages-generated.nix;
|
||||||
|
self = ghcjsNodePkgs;
|
||||||
|
}
|
||||||
|
|
||||||
, version ? "0.2.0"
|
, version ? "0.2.0"
|
||||||
, ghcjsSrc ? fetchFromGitHub {
|
, ghcjsSrc ? fetchFromGitHub {
|
||||||
owner = "ghcjs";
|
owner = "ghcjs";
|
||||||
|
@ -161,12 +166,7 @@ in mkDerivation (rec {
|
||||||
--with-gmp-includes ${gmp.dev}/include \
|
--with-gmp-includes ${gmp.dev}/include \
|
||||||
--with-gmp-libraries ${gmp.out}/lib
|
--with-gmp-libraries ${gmp.out}/lib
|
||||||
'';
|
'';
|
||||||
passthru = let
|
passthru = {
|
||||||
ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix {
|
|
||||||
generated = ./node-packages-generated.nix;
|
|
||||||
self = ghcjsNodePkgs;
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
inherit bootPkgs;
|
inherit bootPkgs;
|
||||||
isCross = true;
|
isCross = true;
|
||||||
isGhcjs = true;
|
isGhcjs = true;
|
||||||
|
|
Loading…
Reference in New Issue