treewide: explicitly specify gtk and related package versions

35 files changed, 74 insertions, 74 deletions

diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix
index d31e9234e09..88bf87b0a84 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk, glib
+{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib
 , gdk_pixbuf }:
 
 assert stdenv.system == "i686-linux";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   # versions.
 
   libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ];
+    [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk_pixbuf ];
 
   passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";
 
diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix
index a8914a9014d..3294d18e70b 100644
--- a/pkgs/applications/misc/artha/default.nix
+++ b/pkgs/applications/misc/artha/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus_glib, gtk, pkgconfig, wordnet }:
+{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }:
 
 stdenv.mkDerivation rec {
   name = "artha-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx";
   };
 
-  buildInputs = [ dbus_glib gtk pkgconfig wordnet ];
+  buildInputs = [ dbus_glib gtk2 pkgconfig wordnet ];
 
   meta = with stdenv.lib; {
     description = "An offline thesaurus based on WordNet";
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix
index 0df0a564731..6cc6cc5d9b9 100644
--- a/pkgs/applications/misc/avrdudess/default.nix
+++ b/pkgs/applications/misc/avrdudess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk, xdg_utils }:
+{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk2, xdg_utils }:
 
 stdenv.mkDerivation rec {
   name = "avrdudess-2.2.20140102";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
     cat >> "$out/bin/avrdudess" << __EOF__
     #!${stdenv.shell}
-    export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk mono]}"
+    export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}"
     # We need PATH from user env for xdg-open to find its tools, which
     # typically depend on the currently running desktop environment.
     export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH"
diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix
index 14416c24d23..22f03419e5b 100644
--- a/pkgs/applications/misc/batti/default.nix
+++ b/pkgs/applications/misc/batti/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl
 , pkgconfig, gettext, pythonPackages
-, gtk, gdk_pixbuf, upower
+, gtk2, gdk_pixbuf, upower
 , makeWrapper }:
 
 let
-  inherit (pythonPackages) dbus-python pygtk python;
+  inherit (pythonPackages) dbus-python pygtk2 python;
 in stdenv.mkDerivation rec {
 
   name = "batti-${version}";
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = with stdenv.lib;
-  [ pkgconfig gettext python gtk pygtk dbus-python gdk_pixbuf upower makeWrapper ];
+  [ pkgconfig gettext python gtk2 pygtk2 dbus-python gdk_pixbuf upower makeWrapper ];
 
   configurePhase = "true";
 
diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix
index 57f6c229a08..e62236e7ae2 100644
--- a/pkgs/applications/misc/clipit/default.nix
+++ b/pkgs/applications/misc/clipit/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, intltool, pkgconfig, gtk, xdotool }:
+{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool }:
 
 stdenv.mkDerivation rec {
   name = "clipit-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva";
   };
 
-  buildInputs = [ intltool pkgconfig gtk xdotool  ];
+  buildInputs = [ intltool pkgconfig gtk2 xdotool  ];
 
   meta = with stdenv.lib; {
     description = "Lightweight GTK+ Clipboard Manager";
diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix
index cdcada196b9..b6d6e53b001 100644
--- a/pkgs/applications/misc/d4x/default.nix
+++ b/pkgs/applications/misc/d4x/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk, glib, pkgconfig, openssl, boost }:
+{ stdenv, fetchurl, gtk2, glib, pkgconfig, openssl, boost }:
 
 stdenv.mkDerivation {
   name = "d4x-2.5.7.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m";
   };
 
-  buildInputs = [ gtk glib pkgconfig openssl boost ];
+  buildInputs = [ gtk2 glib pkgconfig openssl boost ];
 
   meta = {
     description = "Graphical download manager";
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 061a10c6a9f..95cae316a71 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig,
-librsvg, glib, gtk, libXext, libXxf86vm, poppler, xineLib }:
+librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib }:
 
 stdenv.mkDerivation rec {
   name = "eaglemode-0.86.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig
-    librsvg glib gtk libXxf86vm libXext poppler xineLib ];
+    librsvg glib gtk2 libXxf86vm libXext poppler xineLib ];
 
   # The program tries to dlopen both Xxf86vm and Xext, so we use the
   # trick on NIX_LDFLAGS and dontPatchELF to make it find them.
diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix
index 782ef4ae366..09bef975c85 100644
--- a/pkgs/applications/misc/epdfview/default.nix
+++ b/pkgs/applications/misc/epdfview/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk, poppler }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }:
 
 stdenv.mkDerivation rec {
   name = "epdfview-0.1.8";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll";
   };
 
-  buildInputs = [ pkgconfig gtk poppler ];
+  buildInputs = [ pkgconfig gtk2 poppler ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix
index f7a8fe4eafc..1165ced11f9 100644
--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/pkgs/applications/misc/evilvte/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, makeWrapper, pkgconfig,
-  gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
+  gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
   configH
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11
+    gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11
     xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig
   ];
 
diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix
index 685c0ecb4ed..30169588501 100644
--- a/pkgs/applications/misc/fme/default.nix
+++ b/pkgs/applications/misc/fme/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext
-, fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx }:
+, fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }:
 
 stdenv.mkDerivation rec{
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec{
     sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d";
   };
 
-  buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm glibmm libglademm libsigcxx ];
+  buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ];
 
   preConfigure = ''
     ./autogen.sh
diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index f4fec41b9e6..d6a59a89be6 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE
+{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE
 , IOKit ? null }:
 
 stdenv.mkDerivation rec {
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh";
   };
 
-  buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE]
+  buildInputs = [gettext pkgconfig glib gtk2 libX11 libSM libICE]
     ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix
index c3f78efd412..0b6ebe06b88 100644
--- a/pkgs/applications/misc/gksu/default.nix
+++ b/pkgs/applications/misc/gksu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, gnome3, libgksu,
+{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu,
   intltool, libstartup_notification, gtk_doc, wrapGAppsHook
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gtk gnome3.gconf libstartup_notification gnome3.libgnome_keyring
+    gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix
index e894ace0d45..5d13c18edc3 100644
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } :
+{ stdenv, fetchsvn, libxml2, gtk2, curl, pkgconfig } :
 
 let
   version = "31801";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     ignoreExternals = true;
   };
 
-  buildInputs = [ libxml2 gtk curl ];
+  buildInputs = [ libxml2 gtk2 curl ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix
index 10b8065c623..600a5493121 100644
--- a/pkgs/applications/misc/gpa/default.nix
+++ b/pkgs/applications/misc/gpa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk, gpgme, libgpgerror, libassuan }:
+{ stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }:
 
 stdenv.mkDerivation rec {
   name = "gpa-0.9.9";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0d235hcqai7m3qb7m9kvr2r4qg4714f87j9fdplwrlz1p4wdfa38";
   };
 
-  buildInputs = [ intltool pkgconfig gtk gpgme libgpgerror libassuan ];
+  buildInputs = [ intltool pkgconfig gtk2 gpgme libgpgerror libassuan ];
 
   meta = with stdenv.lib; {
     description = "Graphical user interface for the GnuPG";
diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index c6b48af5c06..5026fea0e35 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk
+{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk2
 , libxslt, docbook_xsl, docbook_xml_dtd_42 }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig exiv2 libxml2 gtk
+    pkgconfig exiv2 libxml2 gtk2
     libxslt docbook_xsl docbook_xml_dtd_42
   ];
 
diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix
index 03d333e59e6..623cb12f932 100644
--- a/pkgs/applications/misc/green-pdfviewer/default.nix
+++ b/pkgs/applications/misc/green-pdfviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk }:
+{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "green-pdfviewer-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj";
   };
 
-  buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk ];
+  buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk2 ];
 
   patches = [
     ./gdk-libs.patch
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index 07cecc2d84e..5db5b25947e 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
+{ stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte
 , curl, cdparanoia, libid3tag, ncurses, libtool }:
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl";
   };
 
-  buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia
+  buildInputs = [ gtk2 glib pkgconfig libgnome libgnomeui vte curl cdparanoia
     libid3tag ncurses libtool ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
index aa6a4bd689a..3191c00e9ec 100644
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
     docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme
   ];
 
-  propagatedBuildInputs = with pythonPackages; [ pygobject pygtk pyxdg gnome_python dbus-python sqlite3 ];
+  propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python sqlite3 ];
 
   configurePhase = ''
     python waf configure --prefix="$out"
diff --git a/pkgs/applications/misc/hyperterm/default.nix b/pkgs/applications/misc/hyperterm/default.nix
index b3e0ef71c3c..59cd9ac2696 100644
--- a/pkgs/applications/misc/hyperterm/default.nix
+++ b/pkgs/applications/misc/hyperterm/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, lib, fetchurl, dpkg, gtk, atk, glib, pango, gdk_pixbuf, cairo
+{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
 , GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
-    stdenv.cc.cc gtk atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+    stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
     libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio
   ];
diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix
index fd9077a619c..8e5c5d6206c 100644
--- a/pkgs/applications/misc/jigdo/default.nix
+++ b/pkgs/applications/misc/jigdo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, db, gtk, bzip2 }:
+{ stdenv, fetchurl, db, gtk2, bzip2 }:
 
 stdenv.mkDerivation {
   name = "jigdo-0.7.3";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     sha256 = "0cp4jz3sg9g86vprh90pmwpcfla79f0dr50w14yh01k0yaq70fs8";
   };
 
-  buildInputs = [ db gtk bzip2 ];
+  buildInputs = [ db gtk2 bzip2 ];
 
   configureFlags = "--without-libdb";
 
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index bd0118c75f4..a3c140b6e6c 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, callPackage, overrideCC, fetchurl, makeWrapper, pkgconfig
 , zip, python, zlib, which, icu, libmicrohttpd, lzma, ctpp2, aria2, wget, bc
 , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib
-, gtk, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk
+, gtk2, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk
 }:
 
 let
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
 
     rm $out/bin/kiwix
     makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \
-      --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \
+      --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \
       --suffix PATH : ${aria2}/bin
   '';
 
diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix
index 6bd834846b6..f6bfe61e5aa 100644
--- a/pkgs/applications/misc/lighthouse/default.nix
+++ b/pkgs/applications/misc/lighthouse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig
-, libX11, libxcb, cairo, gtk, pango, python27, python3
+, libX11, libxcb, cairo, gtk2, pango, python27, python3
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
    };
 
   buildInputs = [
-    pkgconfig libX11 libxcb cairo gtk pango python27 python3
+    pkgconfig libX11 libxcb cairo gtk2 pango python27 python3
   ];
 
   makeFlags = [ "PREFIX=\${out}" ];
diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/applications/misc/lxappearance/default.nix
index b6e59613b3c..8683d5b3cea 100644
--- a/pkgs/applications/misc/lxappearance/default.nix
+++ b/pkgs/applications/misc/lxappearance/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk }:
+{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "lxappearance-0.6.1";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz";
     sha256 = "1phnv1b2jdj2vlibjyc9z01izcf3k5zxj8glsaf0i3vh77zqmqq9";
   };
-  buildInputs = [ intltool libX11 pkgconfig gtk ];
+  buildInputs = [ intltool libX11 pkgconfig gtk2 ];
   meta = {
     description = "A lightweight program for configuring the theme and fonts of gtk applications";
     maintainers = [ stdenv.lib.maintainers.hinton ];
diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix
index fc55b275dd0..5c00bddd9d2 100644
--- a/pkgs/applications/misc/multisync/default.nix
+++ b/pkgs/applications/misc/multisync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk, glib, ORBit2, libbonobo, libtool, pkgconfig
+{ stdenv, fetchurl, gtk2, glib, ORBit2, libbonobo, libtool, pkgconfig
 , libgnomeui, GConf, automake, autoconf }:
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
   
   buildInputs =
-    [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
+    [ gtk2 glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
       automake autoconf
     ];
     
diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix
index 53b1106a223..51b29a5c04c 100644
--- a/pkgs/applications/misc/navit/default.nix
+++ b/pkgs/applications/misc/navit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, pkgconfig, gtk, SDL, fontconfig, freetype, imlib2, SDL_image, mesa,
+{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, mesa,
 libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}:
 stdenv.mkDerivation rec {
   name = "navit-svn-3537";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  buildInputs = [ gtk SDL fontconfig freetype imlib2 SDL_image mesa
+  buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image mesa
     libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ];
 
   nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix
index 9e52c629a24..1985b644884 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk, menu-cache }:
+{ stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }:
 
 stdenv.mkDerivation rec {
   name = "openbox-menu-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l";
   };
 
-  buildInputs = [ pkgconfig glib gtk menu-cache ];
+  buildInputs = [ pkgconfig glib gtk2 menu-cache ];
 
   patches = [ ./with-svg.patch ];
 
diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index bf1bed08ed4..e6d96b099fa 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }:
+{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "pcmanfm-1.2.4";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     sha256 = "04z3vd9si24yi4c8calqncdpb9b6mbj4cs4f3fs86i6j05gvpk9q";
   };
 
-  buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ];
+  buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ];
 
   meta = with stdenv.lib; {
     homepage = "http://blog.lxde.org/?cat=28/";
diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
index 0978da3512b..919935a41ee 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib
-, mono, gtk-sharp, gnome-sharp, hyena
+, mono, gtk-sharp-2_0, gnome-sharp, hyena
 , which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   }) ];
 
   buildInputs = [
-    pkgconfig gnome_doc_utils intltool mono gtk-sharp gnome-sharp
+    pkgconfig gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp
     hyena which makeWrapper wrapGAppsHook
   ];
 
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
   postInstall = ''
     makeWrapper "${mono}/bin/mono" "$out/bin/pdfmod" \
       --add-flags "$out/lib/pdfmod/PdfMod.exe" \
-      --prefix MONO_GAC_PREFIX : ${gtk-sharp} \
+      --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
       --prefix MONO_GAC_PREFIX : ${gnome-sharp} \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp gtk-sharp.gtk poppler ]}
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]}
   '';
 
   dontStrip = true;
diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix
index 4798ae5a024..9b376684284 100644
--- a/pkgs/applications/misc/pmenu/default.nix
+++ b/pkgs/applications/misc/pmenu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pythonPackages, gnome }:
+{ stdenv, fetchFromGitLab, pythonPackages, gnome2 }:
 
 stdenv.mkDerivation rec {
   name = "pmenu-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pythonPackages.wrapPython ];
 
-  buildInputs = [ pythonPackages.pygtk gnome.gnome_menus ];
+  buildInputs = [ pythonPackages.pygtk gnome2.gnome_menus ];
 
   pythonPath = [ pythonPackages.pygtk ];
   
diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix
index 1a42d9a90e6..584b8f6a296 100644
--- a/pkgs/applications/misc/tangogps/default.nix
+++ b/pkgs/applications/misc/tangogps/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gettext, gtk, gconf
+{ fetchurl, stdenv, pkgconfig, gettext, gtk2, gconf
 , curl, libexif, sqlite, libxml2 }:
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516";
   };
 
-  buildInputs = [ pkgconfig gettext gtk gconf curl libexif sqlite libxml2 ];
+  buildInputs = [ pkgconfig gettext gtk2 gconf curl libexif sqlite libxml2 ];
 
   # bogus includes fail with newer library version
   postPatch = ''
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 40810adbbdc..f72f4fdc567 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre
-, glib , imlib2, gtk, libXinerama , libXrender, libXcomposite, libXdamage
+, glib , imlib2, gtk2, libXinerama , libXrender, libXcomposite, libXdamage
 , libX11 , libXrandr, librsvg, libpthreadstubs , libXdmcp
 , libstartup_notification , hicolor_icon_theme, wrapGAppsHook
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ];
 
-  buildInputs = [ cairo pango pcre glib imlib2 gtk libXinerama libXrender
+  buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender
     libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs
     libXdmcp libstartup_notification hicolor_icon_theme ];
 
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index 50749681f2c..1e7c7f654b5 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk, expat, curl
+{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl
 , gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper
 , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz";
   };
 
-  buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
+  buildInputs = [ makeWrapper pkgconfig intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils
     libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
   ];
 
diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index e9e34518932..8c554da0362 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch
 , autoconf, automake, gettext, intltool, libtool, pkgconfig
 , libICE, libSM, libXScrnSaver, libXtst, cheetah
-, glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm
+, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm
 , dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     libICE libSM libXScrnSaver libXtst cheetah
-    glib glibmm gtk gtkmm atk pango pangomm cairo cairomm
+    glib glibmm gtkmm2 atk pango pangomm cairo cairomm
     dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx
   ];
 
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index 1a71a2756d1..32daf108c1c 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, xorg, pkgconfig
-, gtkSupport ? true, gtk
+, gtkSupport ? true, gtk2
 , qtSupport ? true, qt4
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm";
   };
   buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ]
-    ++ stdenv.lib.optionals gtkSupport [ gtk ]
+    ++ stdenv.lib.optionals gtkSupport [ gtk2 ]
     ++ stdenv.lib.optionals qtSupport [ qt4 ];
   patchPhase = ''
     substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11.dev}
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 8e3165b75d2..ca0d7775ece 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2
-, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant,
+, aspell, cairo, imlib2, xosd, libnotify, gtk2, pango, atk, enchant,
  gdk_pixbuf}:
 
 let s = import ./src-for-default.nix; in
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo
       xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify
-      gtk pango enchant gdk_pixbuf
+      gtk2 pango enchant gdk_pixbuf
     ];
 
   preConfigure = ''
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
     sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure
     sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
 
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.dev}/include/gtk-2.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.out}/lib/gtk-2.0/include"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.dev}/include/gtk-2.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.out}/lib/gtk-2.0/include"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango.dev}/include/pango-1.0"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0"