From d05e237cb022381da765e070a602f0d9c23634da Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sat, 27 Dec 2014 21:40:18 -0500 Subject: [PATCH] ghcjs-dom: use correct conf-flags and dependencies --- pkgs/top-level/haskell-defaults.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 777859b37fc..be464a3d20e 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -17,6 +17,15 @@ ghcHEADPrefs = self : super : super // { cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = null; }; mtl = self.mtl_2_2_1; + ghcjsBase = null; + ghcjsDom = with self; super.ghcjsDom.override { + cabal = self.cabal.override { + extension = self: super: { + configureFlags = [ "-f-ghcjs" "-fwebkit" "-f-gtk3" ]; + buildDepends = [ mtl glib transformers gtk webkit ]; + }; + }; + }; }; ghc784Prefs = self : super : ghcHEADPrefs self super // { @@ -359,6 +368,14 @@ */ }; extension = self: super: { + ghcjsDom = with self; super.ghcjsDom.override { + cabal = self.cabal.override { + extension = self: super: { + configureFlags = [ ]; + buildDepends = [ mtl ghcjsBase ]; + }; + }; + }; buildLocalCabalWithArgs = args: super.buildLocalCabalWithArgs (args // { nativePkgs = packages_ghc784; });