treewide: explicitly specify gtk and related package versions

5 files changed, 12 insertions, 12 deletions

diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix
index 9a3e0b905e1..88992c8e4e3 100644
--- a/pkgs/tools/misc/alarm-clock-applet/default.nix
+++ b/pkgs/tools/misc/alarm-clock-applet/default.nix
@@ -2,7 +2,7 @@
 , glib
 , gtk2
 , gst_all_1
-, gnome
+, gnome2
 , libnotify
 , libxml2
 , libunique
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
     gtk2
     gst_all_1.gstreamer
     gst_plugins
-    gnome.GConf
-    gnome.gnome_icon_theme
+    gnome2.GConf
+    gnome2.gnome_icon_theme
     libnotify
     libxml2
     libunique
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     wrapGAppsHook
   ];
 
-  propagatedUserEnvPkgs = [ gnome.GConf.out ];
+  propagatedUserEnvPkgs = [ gnome2.GConf.out ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
index fb11a3b8756..ddf9c38ec93 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2
-, pciutils, pkgconfig, gtk, ddccontrol-db
+, pciutils, pkgconfig, gtk2, ddccontrol-db
 }:
 
 let version = "0.4.2"; in
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
 
   buildInputs = [
-    perl perlPackages.libxml_perl libxml2 pciutils gtk ddccontrol-db
+    perl perlPackages.libxml_perl libxml2 pciutils gtk2 ddccontrol-db
   ];
 
   patches = [ ./automake.patch ];
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index d1551eb4ccd..adad66c9bfa 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, perl, gettext, libusb, pkgconfig, bluez
-, readline, pcsclite, libical, gtk, glib, libXpm }:
+, readline, pcsclite, libical, gtk2, glib, libXpm }:
 
 stdenv.mkDerivation rec {
   name = "gnokii-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     perl intltool gettext libusb
-    glib gtk pkgconfig bluez readline
+    glib gtk2 pkgconfig bluez readline
     libXpm pcsclite libical
   ];
 
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index d73def7ab9b..cdf2a4aca86 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, gettext, makeWrapper
-, parted, gtk, glib, libuuid, pkgconfig, gtkmm, libxml2, hicolor_icon_theme
+, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor_icon_theme
 , gpart, hdparm, procps, utillinux
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-doc" ];
 
-  buildInputs = [ parted gtk glib libuuid gtkmm libxml2 hicolor_icon_theme ];
+  buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor_icon_theme ];
   nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ];
 
   postInstall = ''
diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix
index 5f21559d471..f362e7c53a2 100644
--- a/pkgs/tools/misc/gsmartcontrol/default.nix
+++ b/pkgs/tools/misc/gsmartcontrol/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, smartmontools, gtk, gtkmm, libglademm, pkgconfig, pcre }:
+{ fetchurl, stdenv, smartmontools, gtkmm2, libglademm, pkgconfig, pcre }:
 
 stdenv.mkDerivation rec {
   version="0.8.7";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh";
   };
 
-  buildInputs = [ smartmontools gtk gtkmm libglademm pkgconfig pcre ];
+  buildInputs = [ smartmontools gtkmm2 libglademm pkgconfig pcre ];
 
   #installTargets = "install datainstall";