From ceabc66ce2137ef38391ecee34e9f3e59651bd0f Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Fri, 29 Aug 2014 22:08:18 -0400 Subject: [PATCH] Add support for webkit builds to haskellPackages.ghcjsDom --- .../libraries/haskell/ghcjs-dom/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix index b30bd4ff18b..73fe973da02 100644 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix @@ -1,15 +1,19 @@ -{ cabal, fetchgit, ghcjsBase, mtl }: +{ cabal, fetchgit, ghc, mtl +, buildType ? if (builtins.parseDrvName ghc.ghc.name).name == "ghcjs" then "jsffi" else "webkit" +, ghcjsBase ? null # jsffi dependencies +, glib ? null, transformers ? null, gtk ? null, webkit ? null # webkit dependencies +}: cabal.mkDerivation (self: { pname = "ghcjs-dom"; version = "0.1.0.0"; src = fetchgit { - url = git://github.com/ghcjs/ghcjs-dom.git; + url = https://github.com/ghcjs/ghcjs-dom; rev = "81805e75ccd41501774b90c04efd9e00d52e9798"; sha256 = "3aa56fb81974533661aa056ed080edab29bef8ab26dae61999de4452f95949f6"; }; - - buildDepends = [ ghcjsBase mtl ]; + buildDepends = [ mtl ] ++ (if buildType == "jsffi" then [ ghcjsBase ] else if buildType == "webkit" then [ glib transformers gtk webkit ] else throw "unrecognized buildType"); + configureFlags = if buildType == "jsffi" then [ ] else if buildType == "webkit" then [ "-f-ghcjs" "-fwebkit" "-f-gtk3" ] else throw "unrecognized buildType"; meta = { description = "DOM library that supports both GHCJS and WebKitGTK"; license = self.stdenv.lib.licenses.mit;