tree-wide: autorename gnome packages to use dashes

18 files changed, 49 insertions, 49 deletions

diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix
index afb3c834273..a99fb80df72 100644
--- a/pkgs/applications/audio/ario/default.nix
+++ b/pkgs/applications/audio/ario/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt,
-  libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify,
+  libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify,
   libsoup, avahi, taglib
   }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     gettext gtk2 expat intltool libgcrypt libunique gnutls
-    libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib
+    libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib
   ];
 
   meta = {
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 725d0b8b4c7..6890b53f407 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
-, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib
+, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib
 , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
 , libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
 , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gettext glib gtk3 libmowgli dbus_glib libxml2
+    gettext glib gtk3 libmowgli dbus-glib libxml2
     xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
     libpulseaudio fluidsynth libmad libogg libvorbis libcdio
     libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index ea0bce368a1..be70443fd4d 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson
 # deadbeef can use either gtk2 or gtk3
 , gtk2Support ? false, gtk2 ? null
-, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
+, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
 # input plugins
 , vorbisSupport ? true, libvorbis ? null
 , mp123Support ? true, libmad ? null
@@ -30,7 +30,7 @@
 
 assert gtk2Support || gtk3Support;
 assert gtk2Support -> gtk2 != null;
-assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null;
+assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null;
 assert vorbisSupport -> libvorbis != null;
 assert mp123Support -> libmad != null;
 assert flacSupport -> flac != null;
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with stdenv.lib; [ jansson ]
     ++ optional gtk2Support gtk2
-    ++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ]
+    ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ]
     ++ optional vorbisSupport libvorbis
     ++ optional mp123Support libmad
     ++ optional flacSupport flac
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index f9c9dc2faef..1ae9a0e5298 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib
-, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas
+, libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas
 , makeWrapper, gnome3
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper pkgconfig intltool ];
   buildInputs = [
     gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
-    itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf)
+    itstool libxml2 gsettings-desktop-schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf)
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix
index 2d63245fef6..42285ba4bf8 100644
--- a/pkgs/applications/audio/gjay/default.nix
+++ b/pkgs/applications/audio/gjay/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl
+{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl
 , libaudclient }:
 
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ];
+  buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 4bd57e15fe5..c2adc58f9ce 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libtool, intltool, pkgconfig, glib
 , gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique
-, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook
+, libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ];
   buildInputs = [
     glib gtk2 curl mpd_clientlib libsoup
-    libunique libmpd libSM libICE sqlite hicolor_icon_theme
+    libunique libmpd libSM libICE sqlite hicolor-icon-theme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
index 8c2987352fb..d111502651e 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, pkgconfig
 , gcc
 , python3
-, gsettings_desktop_schemas
-, desktop_file_utils
+, gsettings-desktop-schemas
+, desktop-file-utils
 , glib
 , gtk3
 , intltool
 , libsoup
-, json_glib
+, json-glib
 , wrapGAppsHook
 , meson
 , ninja
@@ -44,15 +44,15 @@ in stdenv.mkDerivation rec {
     glib
     intltool
     libsoup
-    json_glib
+    json-glib
 
     gtk3
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
 
     wrapGAppsHook
-    desktop_file_utils
-    gsettings_desktop_schemas
+    desktop-file-utils
+    gsettings-desktop-schemas
   ] ++ gst_plugins;
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index 7ebdce78352..39cd1a444fa 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac,
   gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag,
-  libvorbis, hicolor_icon_theme, gdk_pixbuf }:
+  libvorbis, hicolor-icon-theme, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
   version = "2.1.5";
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
   };
 
-  propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ];
+  propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ];
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser
     flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta
     gnome.gdl gnome.defaultIconTheme
-    hicolor_icon_theme ];
+    hicolor-icon-theme ];
 
   patchPhase = ''
     sed -i 's/which/type -P/' scripts/*.sh
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/gtkpod" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index dcb61119ae7..bcb30168708 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gettext, intltool, pkgconfig, python2
-, avahi, bluez, boost, eigen, fftw, glib, glib_networking
-, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2
+, avahi, bluez, boost, eigen, fftw, glib, glib-networking
+, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2
 , ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom
 , wrapGAppsHook, zita-convolver, zita-resampler
 , optimizationSupport ? false # Enable support for native CPU extensions
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
 
   buildInputs = [
-    avahi bluez boost eigen fftw glib glibmm glib_networking.out
-    gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf
+    avahi bluez boost eigen fftw glib glibmm glib-networking.out
+    gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf
     libsndfile lilv lv2 serd sord sratom zita-convolver
     zita-resampler
   ];
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index 8541ec6e272..0018f17cac0 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook
-, gst_all_1, glib_networking, gobjectIntrospection
+, gst_all_1, glib-networking, gobjectIntrospection
 }:
 
 pythonPackages.buildPythonApplication rec {
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
 
   buildInputs = with gst_all_1; [
     gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
-    glib_networking gobjectIntrospection
+    glib-networking gobjectIntrospection
   ];
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix
index 58054070760..fe9ed12390a 100644
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm
-, dbus_glib, GConf, gconfmm, intltool }:
+, dbus-glib, GConf, gconfmm, intltool }:
 
 stdenv.mkDerivation rec {
   name = "paprefs-0.9.10";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
   };
 
-  buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus_glib gconfmm ];
+  buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix
index 91a270a698e..8425b48166e 100644
--- a/pkgs/applications/audio/patchage/default.nix
+++ b/pkgs/applications/audio/patchage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm
+{ stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm
 , gtkmm2, libjack2, pkgconfig, python2
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2
+    alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2
     pkgconfig python2
   ];
 
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index 69db9d74ee3..d113b8a49b3 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3
-, libcanberra_gtk3, makeWrapper, gnome3 }:
+, libcanberra-gtk3, makeWrapper, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "pavucontrol-3.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
   '';
 
-  buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper
+  buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper
                   gnome3.defaultIconTheme ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index 88db09fac86..60c8f90b6d1 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -11,7 +11,7 @@
 , dbus
 , glibmm
 , gnome3
-, hicolor_icon_theme
+, hicolor-icon-theme
 , libappindicator-gtk3
 , libnotify
 , libxdg_basedir
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     curl
     boost jsoncpp libbsd pcre
-    glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify
+    glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify
     libxdg_basedir
     lsb-release
     wxGTK
diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix
index 534fd2f0edb..5190fe37d8a 100644
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@@ -7,7 +7,7 @@
 , libsoup
 , gnome3
 , tdb
-, json_glib
+, json-glib
 , itstool
 , wrapGAppsHook
 , gst_all_1
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
     intltool
     libsoup
     tdb
-    json_glib
+    json-glib
     itstool
 
     gtk3
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index e91c08c30b7..1afb36571bd 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -19,8 +19,8 @@ in buildPythonApplication rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     intltool wrapGAppsHook
-    gnome3.gnome_themes_standard gnome3.defaultIconTheme
-    gnome3.gsettings_desktop_schemas
+    gnome3.gnome-themes-standard gnome3.defaultIconTheme
+    gnome3.gsettings-desktop-schemas
   ];
 
   postPatch = ''
@@ -28,7 +28,7 @@ in buildPythonApplication rec {
     sed -i '/localmpd/d' sonata/consts.py
   '';
 
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
 
   propagatedBuildInputs = [
     gobjectIntrospection gtk3 pygobject3
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index cbcdc0ecccd..c68f2cd4a35 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero
-, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
+, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
 , makeWrapper }:
 
 let
@@ -16,8 +16,8 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3
-                  gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes
+  buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra-gtk3
+                  gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
                   makeWrapper (stdenv.lib.getLib gnome3.dconf)
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
   preFixup = ''
     for f in $out/bin/* $out/libexec/*; do
       wrapProgram "$f" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
         --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
         --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
     done
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index 2203586c26e..4140c5da5a4 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -4,12 +4,12 @@
 
 , enableXMPP      ? true,  libjreen     ? null
 , enableKDE       ? false, kdelibs4     ? null
-, enableTelepathy ? false, telepathy_qt ? null
+, enableTelepathy ? false, telepathy-qt ? null
 }:
 
 assert enableXMPP      -> libjreen     != null;
 assert enableKDE       -> kdelibs4     != null;
-assert enableTelepathy -> telepathy_qt != null;
+assert enableTelepathy -> telepathy-qt != null;
 
 stdenv.mkDerivation rec {
   name = "tomahawk-${version}";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     makeWrapper
   ] ++ stdenv.lib.optional enableXMPP      libjreen
     ++ stdenv.lib.optional enableKDE       kdelibs4
-    ++ stdenv.lib.optional enableTelepathy telepathy_qt;
+    ++ stdenv.lib.optional enableTelepathy telepathy-qt;
 
   postInstall = let
     pluginPath = stdenv.lib.concatStringsSep ":" [