From 97d9071b95e25eb2d9840b0f24639e2fb8eab5e0 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Thu, 18 Feb 2016 03:11:42 -0500
Subject: [PATCH] ghcjs: use native ghc to build Setup.hs

---
 pkgs/development/haskell-modules/generic-builder.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index d05980192831..b871b7d73faa 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -125,15 +125,8 @@ let
 
   ghcEnv = ghc.withPackages (p: haskellBuildInputs);
 
-  setupBuilder = if isGhcjs
-                 then (if !(builtins.elem pname ["Cabal" "hscolour"])
-                       then ghcCommand
-                       else "${nativeGhc}/bin/ghc")
-                 else ghcCommand;
-
-  setupCommand = if isGhcjs && !(builtins.elem pname ["Cabal" "hscolour"])
-                 then "${ghc.nodejs}/bin/node ./Setup.jsexe/all.js"
-                 else "./Setup";
+  setupBuilder = if isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand;
+  setupCommand = "./Setup";
   ghcCommand = if isGhcjs then "ghcjs" else "ghc";
   ghcCommandCaps = toUpper ghcCommand;