treewide: explicitly specify gtk and related package versions

9 files changed, 18 insertions, 18 deletions

diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix
index e3c28853403..6eb9e94e969 100644
--- a/pkgs/applications/video/coriander/default.nix
+++ b/pkgs/applications/video/coriander/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, gtk, libgnomeui, libXv, libraw1394, libdc1394
+{stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394
 , SDL, automake, GConf }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     cp ${automake}/share/automake-*/mkinstalldirs .
   '';
 
-  buildInputs = [ pkgconfig glib gtk libgnomeui libXv libraw1394 libdc1394 SDL GConf ];
+  buildInputs = [ pkgconfig glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ];
   
   meta = {
     homepage = http://damien.douxchamps.net/ieee1394/coriander/;
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index 0200b0c70f4..cf17b66ef48 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -3,7 +3,7 @@
 , gst_ffmpeg, speex
 , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
 , boost, freetype, agg, dbus, curl, pkgconfig, gettext
-, glib, gtk, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl
+, glib, gtk2, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl
 , freefont_ttf, haxe, swftools
 , lib, makeWrapper
 , xulrunner }:
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
     gst_ffmpeg speex libtool
     libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
-    dbus curl pkgconfig glib gtk gtkglext pangox_compat
+    dbus curl pkgconfig glib gtk2 gtkglext pangox_compat
     xulrunner
     makeWrapper
   ]
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index 7c1d13fd79d..1096a64887b 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, gtk, dbus, dbus_glib, GConf}:
+{stdenv, fetchurl, pkgconfig, glib, gtk2, dbus, dbus_glib, GConf}:
 
 stdenv.mkDerivation rec {
   name = "gnome-mplayer-1.0.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2";
   };
 
-  buildInputs = [pkgconfig glib gtk dbus dbus_glib GConf];
+  buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf];
   
   meta = {
     homepage = http://kdekorte.googlepages.com/gnomemplayer;
diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix
index 9113ff75bfd..8653305f908 100644
--- a/pkgs/applications/video/kazam/default.nix
+++ b/pkgs/applications/video/kazam/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection
-, gtk3, libwnck3, keybinder, intltool, libcanberra }:
+, gtk3, libwnck3, keybinder, intltool, libcanberra_gtk2 }:
 
 
 python3Packages.buildPythonApplication rec {
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
   patches = [ ./datadir.patch ./bug_1190693.patch ];
   prePatch = ''
     rm setup.cfg
-    substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra}/bin/canberra-gtk-play"
+    substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra_gtk2}/bin/canberra-gtk-play"
   '';
 
   # no tests
diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix
index 12fc7151cd0..a579b21a1de 100644
--- a/pkgs/applications/video/key-mon/default.nix
+++ b/pkgs/applications/video/key-mon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonApplication, gnome, librsvg, pygtk, pythonPackages }:
+{ stdenv, fetchurl, buildPythonApplication, gnome2, librsvg, pygtk, pythonPackages }:
 
 buildPythonApplication rec {
   name = "key-mon-${version}";
@@ -11,7 +11,7 @@ buildPythonApplication rec {
   };
 
   propagatedBuildInputs =
-    [ gnome.python_rsvg librsvg pygtk pythonPackages.xlib ];
+    [ gnome2.python_rsvg librsvg pygtk pythonPackages.xlib ];
 
   doCheck = false;
 
diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix
index ea515827087..3d2bf1f1a4f 100644
--- a/pkgs/applications/video/kino/default.nix
+++ b/pkgs/applications/video/kino/default.nix
@@ -50,7 +50,7 @@
 #AMR-WB float support      no
 #AMR-WB IF2 support        no
 
-{ stdenv, fetchurl, gtk, libglade, libxml2, libraw1394, libsamplerate, libdv
+{ stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv
 , pkgconfig, perl, perlXMLParser, libavc1394, libiec61883, libXv, gettext
 , libX11, glib, cairo, intltool, ffmpeg, libv4l
 }:
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i";
   };
 
-  buildInputs = [ gtk libglade libxml2 libraw1394 libsamplerate libdv 
+  buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv
       pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages 
 
   configureFlags = "--enable-local-ffmpeg=no";
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 2a45c1a9eb2..9e08f2fffb1 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -69,13 +69,13 @@ in buildPythonApplication rec {
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
   '';
 
-  buildInputs = with pythonPackages; [ pygtk pygobject ] ++ [
+  buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [
     pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk2 libsoup
     taglib gsettings_desktop_schemas sqlite
   ];
 
   propagatedBuildInputs = with pythonPackages; [
-    pygobject pygtk pycurl sqlite3 mutagen pycairo dbus-python
+    pygobject2 pygtk pycurl sqlite3 mutagen pycairo dbus-python
     pywebkitgtk] ++ [ libtorrentRasterbar
     gst_python gst_plugins_base gst_plugins_good gst_ffmpeg
   ] ++ optional enableBonjour avahi;
diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix
index a0605bb7128..2c5d3d365c1 100644
--- a/pkgs/applications/video/mkcast/default.nix
+++ b/pkgs/applications/video/mkcast/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, wmctrl, pythonPackages, byzanz
-, xdpyinfo, makeWrapper, gtk, xorg, gnome3 }:
+, xdpyinfo, makeWrapper, gtk2, xorg, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "mkcast-2015-03-13";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "15wp3n3z8gw7kjdxs4ahda17n844awhxsqbql5ipsdhqfxah2d8p";
   };
 
-  buildInputs = with pythonPackages; [ makeWrapper pygtk gtk xlib ];
+  buildInputs = with pythonPackages; [ makeWrapper pygtk gtk2 xlib ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix
index 527d31004b0..c8414bbb83a 100644
--- a/pkgs/applications/video/xvidcap/default.nix
+++ b/pkgs/applications/video/xvidcap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk
+{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk2
 , scrollkeeper, libglade, libXmu, libX11, libXext, gettext
 , lame, libXfixes, libXdamage }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   patches = [ ./xlib.patch ];
   buildInputs = [
-    perl perlXMLParser pkgconfig gtk scrollkeeper
+    perl perlXMLParser pkgconfig gtk2 scrollkeeper
     libglade libXmu gettext lame libXdamage libXfixes libXext libX11
   ];