Fix for ghcjs 8.8 build on darwin

circuithub · Dec 17, 2020 · 1accb2c · 1accb2c
1 parent 8a185f0
commit 1accb2c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/lib/ghcjs-project.nix b/lib/ghcjs-project.nix
@@ -76,9 +76,6 @@ let
         ++ lib.optionals stdenv.isDarwin [
           pkgs.buildPackages.gcc # https://github.com/ghcjs/ghcjs/issues/663
         ]
-        ++ lib.optionals (stdenv.isDarwin && isGhcjs88) [
-          pkgs.buildPackages.clang
-        ]
         ++ lib.optional isGhcjs88 [ emsdk ];
     # Configured the GHCJS source
     configured-src = pkgs.runCommand "configured-ghcjs-src" {

diff --git a/overlays/emscripten.nix b/overlays/emscripten.nix
@@ -1,5 +1,6 @@
 final: prev: {
   inherit (import final.haskell-nix.sources.nixpkgs-2003 {
+    system = final.stdenv.system;
     overlays = [(final: prev: with final; {
       binaryen = callPackage ./emscripten/binaryen.nix {};