From 5ca5a4f773ec6447ed400f8be19345342ef502c4 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 30 May 2016 07:51:15 -0400
Subject: [PATCH] gtk2hs-buildtools: hand-code some dependencies
A change in the way the gtk2hs libraries make use of gtk2hs-buildtools
caused them to move the dependency into a stanza where cabal2nix doesn't
pick it up---so we need to do these by hand for the moment.
---
.../haskell-modules/configuration-common.nix | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ee16ba323127..9973d5bca4d8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -229,13 +229,14 @@ self: super: {
jwt = dontCheck super.jwt;
# https://github.com/NixOS/cabal2nix/issues/136
- gio = addPkgconfigDepend super.gio pkgs.glib;
gio_0_13_0_3 = addPkgconfigDepend super.gio_0_13_0_3 pkgs.glib;
gio_0_13_0_4 = addPkgconfigDepend super.gio_0_13_0_4 pkgs.glib;
gio_0_13_1_0 = addPkgconfigDepend super.gio_0_13_1_0 pkgs.glib;
- glib = addPkgconfigDepend super.glib pkgs.glib;
+ # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
+ gio = addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib;
+ glib = addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib;
gtk3 = super.gtk3.override { inherit (pkgs) gtk3; };
- gtk = addPkgconfigDepend super.gtk pkgs.gtk;
+ gtk = addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk;
gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; };
gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
@@ -1007,4 +1008,8 @@ self: super: {
# gtk2hs-buildtools must have Cabal 1.24
gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_0_0; };
+
+ # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza
+ cairo = addBuildTool super.cairo self.gtk2hs-buildtools;
+ pango = addBuildTool super.pango self.gtk2hs-buildtools;
}