diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-07-05 16:09:27 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-07-05 16:12:06 +0200 |
commit | e658ae9694301671ec73acdfe588ddbf78fbae99 (patch) | |
tree | 70526333deddbcc3005824a4e8f03f3654934305 | |
parent | f3439fcfd41b7fc941f39de184bf12be05c0fd2d (diff) | |
download | nixlib-e658ae9694301671ec73acdfe588ddbf78fbae99.tar nixlib-e658ae9694301671ec73acdfe588ddbf78fbae99.tar.gz nixlib-e658ae9694301671ec73acdfe588ddbf78fbae99.tar.bz2 nixlib-e658ae9694301671ec73acdfe588ddbf78fbae99.tar.lz nixlib-e658ae9694301671ec73acdfe588ddbf78fbae99.tar.xz nixlib-e658ae9694301671ec73acdfe588ddbf78fbae99.tar.zst nixlib-e658ae9694301671ec73acdfe588ddbf78fbae99.zip |
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.
-rw-r--r-- | pkgs/development/libraries/haskell/gtkglext/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/haskell/gtkglext/default.nix b/pkgs/development/libraries/haskell/gtkglext/default.nix index 3612962ec882..b98b478429cd 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"; |