diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-06-13 12:59:13 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-06-13 13:02:24 +0200 |
commit | 84262c18e3a7dd980245a7d059ace83b16128510 (patch) | |
tree | 0508af3f04d448d695bcf15097ff1d3bc9db311b /pkgs | |
parent | 3d1491c166e4fb54e5c3e427924be99784d5722c (diff) | |
download | nixlib-84262c18e3a7dd980245a7d059ace83b16128510.tar nixlib-84262c18e3a7dd980245a7d059ace83b16128510.tar.gz nixlib-84262c18e3a7dd980245a7d059ace83b16128510.tar.bz2 nixlib-84262c18e3a7dd980245a7d059ace83b16128510.tar.lz nixlib-84262c18e3a7dd980245a7d059ace83b16128510.tar.xz nixlib-84262c18e3a7dd980245a7d059ace83b16128510.tar.zst nixlib-84262c18e3a7dd980245a7d059ace83b16128510.zip |
pygtk: propagate gtk (fixes solfege build)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/pygtk/default.nix | 7 | ||||
-rw-r--r-- | 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 07d57591f1ac..940ba18f2a2a 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 89e1faeb9b2a..a848f4707d85 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; }; |