From 4ab133a2c49be6915d79ef0cb05fd37ab36d46a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 20 Jan 2015 12:56:04 +0100
Subject: [PATCH] haskell-ng: fix 'gio' and 'pango' builds

This fixes https://github.com/NixOS/nixpkgs/issues/5863.
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 pkgs/development/haskell-modules/hackage-packages.nix     | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 00eb3f32621e..9020cf46fca6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -149,6 +149,10 @@ self: super: {
        sha256 = "0q8j9zwi5q651q5zd3mz52nz4ki36rvixbkp20nx2vf5imi050bq";
     })];});
 
+  # https://github.com/NixOS/cabal2nix/issues/136
+  gio = overrideCabal (super.gio.override { glib = self.glib; }) (drv: { pkgconfigDepends = [pkgs.glib]; });
+  pango = super.pango.override { cairo = self.cairo; };
+
 }
 // {
   # Not on Hackage yet.
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 84a800594a7b..a690b82f17ac 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -48230,7 +48230,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GIO";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) glib;};
 
   "gipeda" = callPackage
@@ -48938,7 +48937,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs.gnome) libglade;};
 
   "gladexml-accessor" = callPackage
@@ -86554,7 +86552,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Pango text rendering engine";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) cairo;  inherit (pkgs.gnome) pango;};
 
   "papillon" = callPackage