public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pygtk: propagate gtk (fixes solfege build)

Browse Source
This commit is contained in:
Vladimír Čunát 2013-06-13 12:59:13 +02:00
parent 3d1491c166
commit 84262c18e3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/python-modules/pygtk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo { stdenv, fetchurl, python, pkgconfig, gtk, pygobject, pycairo
, buildPythonPackage, libglade ? null }: , buildPythonPackage, libglade ? null }:
buildPythonPackage rec { buildPythonPackage rec {
@ -9,11 +9,10 @@ buildPythonPackage rec {
sha256 = "4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8"; sha256 = "4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8";
}; };
buildInputs = buildInputs = [ pkgconfig ]
[ pkgconfig glib gtk ]
++ stdenv.lib.optional (libglade != null) libglade; ++ stdenv.lib.optional (libglade != null) libglade;
propagatedBuildInputs = [ pygobject pycairo ]; propagatedBuildInputs = [ gtk pygobject pycairo ];
installCommand = "make install"; installCommand = "make install";
checkPhase = stdenv.lib.optionalString (libglade == null) checkPhase = stdenv.lib.optionalString (libglade == null)

2
pkgs/top-level/python-packages.nix
View File

@ -97,7 +97,7 @@ pythonPackages = python.modules // rec {
}; };
pygtk = import ../development/python-modules/pygtk { pygtk = import ../development/python-modules/pygtk {
inherit (pkgs) fetchurl stdenv pkgconfig glib gtk; inherit (pkgs) fetchurl stdenv pkgconfig gtk;
inherit python buildPythonPackage pygobject pycairo; inherit python buildPythonPackage pygobject pycairo;
}; };