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 465bf1af802..fb7a75851c8 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 c9d11ce90b3..4eb2be5552f 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 47b450afc4e..8a212413b02 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 aa872a950fc..e880f7e713e 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 <) = ap @@ -98,4 +98,5 @@ self: super: { ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { buildDepends = [ self.base self.mtl self.text self.ghcjs-base ]; }); + }