From bccd75094fd5108b3d834ad3a86e056eed3b0337 Mon Sep 17 00:00:00 2001
From: Kirill Boltaev <aske@fmap.me>
Date: Mon, 12 Sep 2016 00:24:51 +0300
Subject: treewide: explicitly specify gtk and related package versions

---
 pkgs/development/python-modules/libsexy/default.nix         | 4 ++--
 pkgs/development/python-modules/pygtk/default.nix           | 8 ++++----
 pkgs/development/python-modules/pygtksourceview/default.nix | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'pkgs/development/python-modules')

diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix
index cdf5a73768d4..52a2c586f858 100644
--- a/pkgs/development/python-modules/libsexy/default.nix
+++ b/pkgs/development/python-modules/libsexy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, }:
+{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, }:
 
 stdenv.mkDerivation rec {
   name = "python-libsexy-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    libsexy gtk glib pango libxml2
+    libsexy gtk2 glib pango libxml2
   ];
 
   postInstall = ''
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index 5354d9750f41..7d0896c1fb8b 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, gtk, pygobject, pycairo
+{ stdenv, fetchurl, python, pkgconfig, gtk2, pygobject2, pycairo
 , buildPythonPackage, libglade ? null, isPy3k }:
 
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   buildInputs = [ pkgconfig ]
     ++ stdenv.lib.optional (libglade != null) libglade;
 
-  propagatedBuildInputs = [ gtk pygobject pycairo ];
+  propagatedBuildInputs = [ gtk2 pygobject2 pycairo ];
 
   configurePhase = "configurePhase";
 
@@ -43,8 +43,8 @@ buildPythonPackage rec {
 
   postInstall = ''
     rm $out/bin/pygtk-codegen-2.0
-    ln -s ${pygobject}/bin/pygobject-codegen-2.0  $out/bin/pygtk-codegen-2.0
-    ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject.version}.pth \
+    ln -s ${pygobject2}/bin/pygobject-codegen-2.0  $out/bin/pygtk-codegen-2.0
+    ln -s ${pygobject2}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject2.version}.pth \
                   $out/lib/${python.libPrefix}/site-packages/${name}.pth
   '';
 }
diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix
index 1c248251a32f..133cbdb34fd2 100644
--- a/pkgs/development/python-modules/pygtksourceview/default.nix
+++ b/pkgs/development/python-modules/pygtksourceview/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject, glib, pygtk, gnome2 }:
+{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject2, glib, pygtk, gnome2 }:
 
 let version = "2.10.1"; in
 
@@ -12,7 +12,7 @@ mkPythonDerivation {
 
   patches = [ ./codegendir.patch ];
 
-  buildInputs = [ python pkgconfig pygobject glib pygtk gnome2.gtksourceview ];
+  buildInputs = [ python pkgconfig pygobject2 glib pygtk gnome2.gtksourceview ];
 
   meta = {
     platforms = lib.platforms.unix;
-- 
cgit 1.4.1