From 0e223ffafe5d0c96b96b463bb536e422c5db380b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 31 Mar 2015 16:30:28 +0300
Subject: [PATCH] haskellng.jsaddle: fix on non-ghcjs

---
 .../haskell-modules/configuration-ghc-7.10.x.nix            | 6 ++++++
 .../development/haskell-modules/configuration-ghc-7.8.x.nix | 5 +++++
 pkgs/development/haskell-modules/configuration-ghc-head.nix | 5 +++++
 pkgs/development/haskell-modules/configuration-ghcjs.nix    | 3 ++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 465bf1af802a..fb7a75851c87 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -303,4 +303,10 @@ self: super: {
       sed -i -e "s,<\*,<¤,g" XMonad/Actions/Volume.hs
     '';
   });
+
+  # Workaround for a workaround, see comment for "ghcjs" flag.
+  jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
+            in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
+                                          self.webkitgtk3-javascriptcore ];
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index c9d11ce90b33..4eb2be5552f1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -120,4 +120,9 @@ self: super: {
   # Newer versions require base > 4.7
   gloss = super.gloss_1_9_2_1;
 
+  # Workaround for a workaround, see comment for "ghcjs" flag.
+  jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
+            in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
+                                          self.webkitgtk3-javascriptcore ];
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 47b450afc4ea..8a212413b02e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -85,4 +85,9 @@ self: super: {
   # https://github.com/ndmitchell/extra/issues/4
   extra = dontCheck super.extra;
 
+  # Workaround for a workaround, see comment for "ghcjs" flag.
+  jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
+            in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
+                                          self.webkitgtk3-javascriptcore ];
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index aa872a950fcb..e880f7e713e8 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -71,7 +71,7 @@ self: super: {
       cat >> src/Reactive/Banana/Switch.hs <<EOF
       instance Functor (AnyMoment Identity) where
         fmap = liftM
-        
+
       instance Applicative (AnyMoment Identity) where
         pure = return
         (<*>) = ap
@@ -98,4 +98,5 @@ self: super: {
   ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
     buildDepends = [ self.base self.mtl self.text self.ghcjs-base ];
   });
+
 }