Merge branch 'ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc

2019-12-25 01:31:35 -05:00
parent 891662e829 95464f6ad3
commit a8bd27b454
3 changed files with 18 additions and 17 deletions
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, pkgsHostHost
 , callPackage
 , fetchgit
 , ghcjsSrcJson ? null
@@ -14,7 +15,6 @@
 , pkgconfig
 , gcc
 , lib
-, nodePackages
 , ghcjsDepOverrides ? (_:_:{})
 , haskell
 }:
@@ -46,7 +46,7 @@ let

    enableShared = true;

-    socket-io = nodePackages."socket.io";
+    socket-io = pkgsHostHost.nodePackages."socket.io";

    # Relics of the old GHCJS build system
    stage1Packages = [];