summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghcjs.nix
diff options
context:
space:
mode:
authorRodney Lorrimar <dev@rodney.id.au>2016-11-21 19:51:59 +0000
committerProfpatsch <mail@profpatsch.de>2016-11-21 20:51:59 +0100
commitde2f9d67196c05ac9b4efedc7cc880ea1315f7bf (patch)
tree72bcf681b560ad09d9c403f4c29a91d9c2195b40 /pkgs/development/haskell-modules/configuration-ghcjs.nix
parentdcb37919f798eda9b3e038abd32c482b917611bf (diff)
downloadnixpkgs-de2f9d67196c05ac9b4efedc7cc880ea1315f7bf.tar
nixpkgs-de2f9d67196c05ac9b4efedc7cc880ea1315f7bf.tar.gz
nixpkgs-de2f9d67196c05ac9b4efedc7cc880ea1315f7bf.tar.bz2
nixpkgs-de2f9d67196c05ac9b4efedc7cc880ea1315f7bf.tar.lz
nixpkgs-de2f9d67196c05ac9b4efedc7cc880ea1315f7bf.tar.xz
nixpkgs-de2f9d67196c05ac9b4efedc7cc880ea1315f7bf.tar.zst
nixpkgs-de2f9d67196c05ac9b4efedc7cc880ea1315f7bf.zip
haskellPackages.ghcjs-dom: Add overrides (#20474)
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghcjs.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghcjs.nix20
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 7c8541c5b47..894022c176b 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -96,10 +96,15 @@ self: super:
      }) {};
 
   ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
-    libraryHaskellDepends = [ self.ghcjs-base ] ++
-      removeLibraryHaskellDepends [
-        "glib" "gtk" "gtk3" "webkitgtk" "webkitgtk3"
-      ] drv.libraryHaskellDepends;
+    libraryHaskellDepends = with self; [
+      ghcjs-base ghcjs-dom-jsffi text transformers
+    ];
+    configureFlags = [ "-fjsffi" "-f-webkit" ];
+  });
+
+  ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: {
+    libraryHaskellDepends = [ self.ghcjs-base self.text ];
+    isLibrary = true;
   });
 
   ghc-paths = overrideCabal super.ghc-paths (drv: {
@@ -153,13 +158,12 @@ self: super:
   });
 
   semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ];
-  # triggers an internal pattern match failure in haddock
-  # https://github.com/haskell/haddock/issues/553
-  wai = dontHaddock super.wai;
 
   transformers-compat = overrideCabal super.transformers-compat (drv: {
     configureFlags = [];
   });
 
-
+  # triggers an internal pattern match failure in haddock
+  # https://github.com/haskell/haddock/issues/553
+  wai = dontHaddock super.wai;
 }