mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
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
|
||||
, 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;
|
||||
|
Loading…
Reference in New Issue
Block a user