From 33b76a9312cde13c0a766259ac753e3fd26abcda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 5 May 2009 23:06:01 +0000
Subject: [PATCH] added json Haskell package; improved gtk2hs

svn path=/nixpkgs/trunk/; revision=15460
---
 .../development/libraries/haskell/gtk2hs/default.nix |  9 +++++++++
 pkgs/development/libraries/haskell/json/default.nix  | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  4 ++++
 3 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/json/default.nix

diff --git a/pkgs/development/libraries/haskell/gtk2hs/default.nix b/pkgs/development/libraries/haskell/gtk2hs/default.nix
index f8d3ce43208f..6409af3de2c6 100644
--- a/pkgs/development/libraries/haskell/gtk2hs/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs/default.nix
@@ -20,10 +20,19 @@ stdenv.mkDerivation rec {
     gnome.GConf gtksourceview gnome.librsvg
   ];
 
+  preConfigure =
+    ''
+      sed -i gio/gio.package.conf.in -e 's|@GIO_LIBDIR_CQ@|"${gnome.glib}/lib", "${gnome.glib}/lib64", @GIO_LIBDIR_CQ@|'
+      sed -i gtk/gtk.package.conf.in -e 's|@GTK_LIBDIR_CQ@|"${gnome.glib}/lib", "${gnome.glib}/lib64", @GTK_LIBDIR_CQ@|'
+    '';
+
+  configureFlags = ["--without-pkgreg"];
+
   postInstall =
     ''
       local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version}
       local installedPkgConf=$confDir/${fname}.installedconf
+      ensureDir $out/bin # necessary to get it added to PATH
       ensureDir $confDir
       echo $installedPkgConf
       echo '[]' > $installedPkgConf
diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix
new file mode 100644
index 000000000000..5a59e94396b8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/json/default.nix
@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "json";
+  version = "0.4.3";
+  sha256 = "56192d1e922cc71ad1aaf31baea8ee7e1f1b862f95bc72f60548caee4a484a87";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Support for serialising Haskell to and from JSON";
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d84691de1fa9..69d52433f65e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -149,6 +149,10 @@ rec {
     inherit cabal;
   };
 
+  json = import ../development/libraries/haskell/json {
+    inherit cabal mtl;
+  };
+
   maybench = import ../development/libraries/haskell/maybench {
     inherit cabal benchpress;
   };