Merge pull request #22574 from k0001/ghcjs-node

compilers/ghcjs/base.nix: Take ghcjsNodePkgs as argument

authored by Domen Kožar and committed by GitHub fe6ebba5 ffe935ee

+6 -6
+6 -6
pkgs/development/compilers/ghcjs/base.nix
··· 40 , coreutils 41 , libiconv 42 43 , version ? "0.2.0" 44 , ghcjsSrc ? fetchFromGitHub { 45 owner = "ghcjs"; ··· 161 --with-gmp-includes ${gmp.dev}/include \ 162 --with-gmp-libraries ${gmp.out}/lib 163 ''; 164 - passthru = let 165 - ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix { 166 - generated = ./node-packages-generated.nix; 167 - self = ghcjsNodePkgs; 168 - }; 169 - in { 170 inherit bootPkgs; 171 isCross = true; 172 isGhcjs = true;
··· 40 , coreutils 41 , libiconv 42 43 + , ghcjsNodePkgs ? callPackage ../../../top-level/node-packages.nix { 44 + generated = ./node-packages-generated.nix; 45 + self = ghcjsNodePkgs; 46 + } 47 + 48 , version ? "0.2.0" 49 , ghcjsSrc ? fetchFromGitHub { 50 owner = "ghcjs"; ··· 166 --with-gmp-includes ${gmp.dev}/include \ 167 --with-gmp-libraries ${gmp.out}/lib 168 ''; 169 + passthru = { 170 inherit bootPkgs; 171 isCross = true; 172 isGhcjs = true;