BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #22574 from k0001/ghcjs-node

Browse source 
compilers/ghcjs/base.nix: Take ghcjsNodePkgs as argument
This commit is contained in:
Domen Kožar 2017-02-27 14:28:36 +01:00 committed by GitHub
commit fe6ebba59c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/compilers/ghcjs/base.nix
View file

@ -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;