Merge branch 'master'

7 files changed, 15 insertions, 15 deletions

diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
index 44e8a26eee15..4be84589080c 100644
--- a/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5/bluedevil.nix
@@ -1,12 +1,12 @@
 {
-  mkDerivation, extra-cmake-modules, shared_mime_info,
+  mkDerivation, extra-cmake-modules, shared-mime-info,
   bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio,
   knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative
 }:
 
 mkDerivation {
   name = "bluedevil";
-  nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
+  nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
   buildInputs = [
     bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
     kdbusaddons kded kiconthemes knotifications kwidgetsaddons
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 5bb8b0f9ef80..6da0ad22d115 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -26,7 +26,7 @@ existing packages here and modify it as necessary.
 
 {
   libsForQt5, lib, fetchurl,
-  gconf, gsettings_desktop_schemas,
+  gconf, gsettings-desktop-schemas,
   debug ? false,
 }:
 
@@ -105,7 +105,7 @@ let
       breeze-plymouth = callPackage ./breeze-plymouth {};
       kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
       kde-cli-tools = callPackage ./kde-cli-tools.nix {};
-      kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings_desktop_schemas; };
+      kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; };
       kdecoration = callPackage ./kdecoration.nix {};
       kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
       kgamma5 = callPackage ./kgamma5.nix {};
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index f792f3b939f4..35d90a246bc6 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules,
   glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
-  knewstuff, gsettings_desktop_schemas
+  knewstuff, gsettings-desktop-schemas
 }:
 
 mkDerivation {
@@ -10,12 +10,12 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
-    knewstuff gsettings_desktop_schemas
+    knewstuff gsettings-desktop-schemas
   ];
   patches = [ ./0001-follow-symlinks.patch ];
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
-    "-DGLIB_SCHEMAS_DIR=${gsettings_desktop_schemas.out}/"
+    "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"
   ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
index 79b5cfb437e2..75144d352223 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
+++ b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
@@ -16,7 +16,7 @@ index 568cb34..98a5992 100644
  #include <KLocale>
  
 -const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml";
-+const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml";
++const QString MobileProviders::ProvidersFile = "@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml";
  
  bool localeAwareCompare(const QString & one, const QString & two) {
      return one.localeAwareCompare(two) < 0;
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index cc1dcb7ee9f7..214dbd9cc042 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -4,7 +4,7 @@
   kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative,
   kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications,
   kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
-  mobile_broadband_provider_info, modemmanager-qt, networkmanager-qt,
+  mobile-broadband-provider-info, modemmanager-qt, networkmanager-qt,
   openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid
 }:
 
@@ -15,13 +15,13 @@ mkDerivation {
     kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
     qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
     kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
-    mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
+    mobile-broadband-provider-info modemmanager-qt networkmanager-qt openconnect
     qca-qt5 solid
   ];
   patches = [
     (substituteAll {
       src = ./0001-mobile-broadband-provider-info-path.patch;
-      inherit mobile_broadband_provider_info;
+      inherit mobile-broadband-provider-info;
     })
     (substituteAll {
       src = ./0002-openvpn-binary-path.patch;
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index 0bfad2b5c8e4..b60b5298d6db 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules, kdoctools,
   gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n,
-  libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem
+  libcanberra-gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem
 }:
 
 mkDerivation {
@@ -10,6 +10,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n
-    libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem
+    libcanberra-gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem
   ];
 }
diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix
index 65912083a4cf..6becf3bf420b 100644
--- a/pkgs/desktops/plasma-5/sddm-kcm.nix
+++ b/pkgs/desktops/plasma-5/sddm-kcm.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, extra-cmake-modules, shared_mime_info,
+  mkDerivation, extra-cmake-modules, shared-mime-info,
   libpthreadstubs, libXcursor, libXdmcp,
   qtquickcontrols2, qtx11extras,
   karchive, ki18n, kio, knewstuff
@@ -7,7 +7,7 @@
 
 mkDerivation {
   name = "sddm-kcm";
-  nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
+  nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
   buildInputs = [
     libpthreadstubs libXcursor libXdmcp
     qtquickcontrols2 qtx11extras