Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs

5 files changed, 11 insertions, 11 deletions

diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix
index a5900f2ce25..0c8b0f5ce60 100644
--- a/pkgs/development/compilers/aliceml/default.nix
+++ b/pkgs/development/compilers/aliceml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome, pango, sqlite, libxml2, zlib, gmp, smlnj }:
+{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome2, pango, sqlite, libxml2, zlib, gmp, smlnj }:
 
 stdenv.mkDerivation {
   name = "aliceml-1.4-7d44dc8e";
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   buildInputs = [
     stdenv gcc glibc
     libtool gnumake autoconf automake
-    file which zsh m4 gnome.gtk zlib gmp
-    gnome.libgnomecanvas pango sqlite
+    file which zsh m4 gnome2.gtk zlib gmp
+    gnome2.libgnomecanvas pango sqlite
     libxml2 pkgconfig perl smlnj
   ];
 
diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix
index 68d3e4d12ed..5fa88ab87e9 100644
--- a/pkgs/development/compilers/boo/default.nix
+++ b/pkgs/development/compilers/boo/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant
-, shared_mime_info, gtksourceview, gtk
+, shared_mime_info, gtksourceview, gtk2
 , targetVersion ? "4.5" }:
 
 let
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig mono makeWrapper nant shared_mime_info gtksourceview
-    gtk
+    gtk2
   ];
 
   patches = [ ./config.patch ];
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 1f2be91b13a..704d9d5be64 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -1,7 +1,7 @@
 {
 stdenv, fetchurl
 , fpc
-, gtk, glib, pango, atk, gdk_pixbuf
+, gtk2, glib, pango, atk, gdk_pixbuf
 , libXi, inputproto, libX11, xproto, libXext, xextproto
 , makeWrapper
 }:
@@ -15,7 +15,7 @@ let
     name = "lazarus-${version}";
   };
   buildInputs = [
-    fpc gtk glib libXi inputproto
+    fpc gtk2 glib libXi inputproto
     libX11 xproto libXext xextproto pango atk
     stdenv.cc makeWrapper gdk_pixbuf
   ];
diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix
index 5d9ca621648..b75b57d0f47 100644
--- a/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp,
-gnutls, gnome, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }:
+gnutls, gnome2, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }:
 
 assert emacsSupport -> (emacs != null);
 
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
   # The dependencies and their justification are explained at
   # http://smalltalk.gnu.org/download
   buildInputs = [
-    pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome.gtk
+    pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk
     cairo SDL sqlite
   ]
   ++ stdenv.lib.optional emacsSupport emacs;
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 775971821aa..8fe775de146 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -26,7 +26,7 @@
 , mesa_noglu
 , freetype
 , fontconfig
-, gnome
+, gnome2
 , cairo
 , alsaLib
 , atk
@@ -177,7 +177,7 @@ let result = stdenv.mkDerivation rec {
    * libXt is only needed on amd64
    */
   libraries =
-    [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++
+    [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk] ++
     (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
 
   rpath = stdenv.lib.strings.makeLibraryPath libraries;