Merge branch 'master'

8 files changed, 14 insertions, 14 deletions

diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index afa27a93bad..778a1cc920f 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2
+{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2
 , polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }:
 
 assert withGtk -> (gtk2 != null);
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" "man" ];
 
-  buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ]
+  buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ]
     # polkit requires pam, which requires shadow.h, which is not available on
     # darwin
     ++ stdenv.lib.optional (!stdenv.isDarwin) polkit
diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix
index b0b669148ff..9bcc9ab6cab 100644
--- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix
+++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, pkgconfig, popt, atk, gtk, libX11, libICE, libXtst, libXi
-, intltool, libbonobo, ORBit2, GConf, dbus_glib }:
+, intltool, libbonobo, ORBit2, GConf, dbus-glib }:
 
 stdenv.mkDerivation {
   name = "at-spi-1.32.0";
@@ -13,5 +13,5 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi
-                  intltool libbonobo ORBit2 GConf dbus_glib ];
+                  intltool libbonobo ORBit2 GConf dbus-glib ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
index c00f0a9c37b..54a2bd526a9 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s";
   };
 
-  propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which
+  propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome-common tends to require which
 
   patches = [(fetchurl {
     name = "gnome-common-patch";
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index 06af8a63200..4ca0e791a2a 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus_glib
+{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib
 , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ intltool pkgconfig ];
   buildInputs =
-    [ libxml2 bzip2 openssl dbus_glib fam cdparanoia
+    [ libxml2 bzip2 openssl dbus-glib fam cdparanoia
       gnome_mime_data avahi acl
     ];
 
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
index 49b8cc88f9d..493f88290f3 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk3, intltool,
-GConf, enchant, isocodes, gnome_icon_theme, gsettings_desktop_schemas }:
+GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
   version = "4.10.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya";
   };
 
-  propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ];
+  propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome_icon_theme GConf ];
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ intltool enchant isocodes ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
index d93ef73ca98..ee0bf5f82a0 100644
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt
+{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus-glib, libxml2, popt
 , intltool, ORBit2, procps }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index 5a488e052c1..2dcb85235ee 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra_gtk2
+{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2
 , intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg
 }:
 
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra_gtk2 libtool ];
+  buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ];
   propagatedBuildInputs = [ glib libbonobo libogg ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
index 24cd851eef6..838e5133745 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango
 , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
-, gnome_vfs, libgnome_keyring, libglade }:
+, gnome_vfs, libgnome-keyring, libglade }:
 
 stdenv.mkDerivation rec {
   name = "libgnomeui-${minVer}.5";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs =
-    [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ];
+    [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ];
 
   propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
 }