From e658ae9694301671ec73acdfe588ddbf78fbae99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 5 Jul 2014 16:09:27 +0200 Subject: [PATCH] Revert "haskell-gtkglext: update to version 0.12.5.0" Because it breaks nixpkgs evaluation: $ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace error: while querying the derivation named `haskell-gtkglext-ghc7.6.3-0.12.5.0': while evaluating the attribute `propagatedNativeBuildInputs' of the derivation `haskell-gtkglext-ghc7.6.3-0.12.5.0' at /home/bfo/nixpkgs/pkgs/build-support/cabal/default.nix:70:13: infinite recursion encountered This reverts commit 6ba32aa8bdfd73b6b55d07f270a3f344007ab7cb. --- pkgs/development/libraries/haskell/gtkglext/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtkglext/default.nix b/pkgs/development/libraries/haskell/gtkglext/default.nix index 3612962ec88..b98b478429c 100644 --- a/pkgs/development/libraries/haskell/gtkglext/default.nix +++ b/pkgs/development/libraries/haskell/gtkglext/default.nix @@ -1,12 +1,12 @@ -{ cabal, glib, gtk, gtk2hsBuildtools, gtkglext, pango }: +{ pkgs, cabal, gtk, gtk2hsBuildtools, pangox_compat }: cabal.mkDerivation (self: { pname = "gtkglext"; version = "0.12.5.0"; sha256 = "1xhalcb85cpswdpqxx64fxpmyqq7iakgaczjrbr25fp0h1glshhk"; - buildDepends = [ glib gtk pango ]; + buildDepends = [ gtk ]; buildTools = [ gtk2hsBuildtools ]; - pkgconfigDepends = [ gtkglext ]; + pkgconfigDepends = [ pkgs.gnome2.gtkglext pangox_compat ]; meta = { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GTK+ OpenGL Extension";