From 84262c18e3a7dd980245a7d059ace83b16128510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Jun 2013 12:59:13 +0200
Subject: [PATCH] pygtk: propagate gtk (fixes solfege build)
---
pkgs/development/python-modules/pygtk/default.nix | 7 +++----
pkgs/top-level/python-packages.nix | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index 07d57591f1a..940ba18f2a2 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo
+{ stdenv, fetchurl, python, pkgconfig, gtk, pygobject, pycairo
, buildPythonPackage, libglade ? null }:
buildPythonPackage rec {
@@ -9,11 +9,10 @@ buildPythonPackage rec {
sha256 = "4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8";
};
- buildInputs =
- [ pkgconfig glib gtk ]
+ buildInputs = [ pkgconfig ]
++ stdenv.lib.optional (libglade != null) libglade;
- propagatedBuildInputs = [ pygobject pycairo ];
+ propagatedBuildInputs = [ gtk pygobject pycairo ];
installCommand = "make install";
checkPhase = stdenv.lib.optionalString (libglade == null)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89e1faeb9b2..a848f4707d8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -97,7 +97,7 @@ pythonPackages = python.modules // rec {
};
pygtk = import ../development/python-modules/pygtk {
- inherit (pkgs) fetchurl stdenv pkgconfig glib gtk;
+ inherit (pkgs) fetchurl stdenv pkgconfig gtk;
inherit python buildPythonPackage pygobject pycairo;
};