From 892b7c451f7d75acaf956646520468c261fedb7e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 25 Oct 2015 09:16:25 -0500
Subject: [PATCH] plasma-nm: path to mobile-broadband-provider-info

Fixes #9389.
---
 pkgs/desktops/plasma-5.4/default.nix          |  2 +-
 ...-mobile-broadband-provider-info-path.patch | 25 +++++++++++++++++++
 .../{plasma-nm.nix => plasma-nm/default.nix}  | 10 ++++++--
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch
 rename pkgs/desktops/plasma-5.4/{plasma-nm.nix => plasma-nm/default.nix} (75%)

diff --git a/pkgs/desktops/plasma-5.4/default.nix b/pkgs/desktops/plasma-5.4/default.nix
index 61a06421c3dd..59b09a2dfbe2 100644
--- a/pkgs/desktops/plasma-5.4/default.nix
+++ b/pkgs/desktops/plasma-5.4/default.nix
@@ -72,7 +72,7 @@ let
     oxygen-fonts = callPackage ./oxygen-fonts.nix {};
     plasma-desktop = callPackage ./plasma-desktop {};
     plasma-mediacenter = callPackage ./plasma-mediacenter.nix {};
-    plasma-nm = callPackage ./plasma-nm.nix {};
+    plasma-nm = callPackage ./plasma-nm {};
     plasma-pa = callPackage ./plasma-pa.nix {};
     plasma-workspace = callPackage ./plasma-workspace {};
     plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
diff --git a/pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch
new file mode 100644
index 000000000000..79b5cfb437e2
--- /dev/null
+++ b/pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch
@@ -0,0 +1,25 @@
+From faf13c97ff1192a201843b9d52f4002dbd9022af Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 25 Oct 2015 09:09:27 -0500
+Subject: [PATCH] mobile-broadband-provider-info path
+
+---
+ libs/editor/mobileproviders.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/editor/mobileproviders.cpp b/libs/editor/mobileproviders.cpp
+index 568cb34..98a5992 100644
+--- a/libs/editor/mobileproviders.cpp
++++ b/libs/editor/mobileproviders.cpp
+@@ -26,7 +26,7 @@
+ 
+ #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";
+ 
+ bool localeAwareCompare(const QString & one, const QString & two) {
+     return one.localeAwareCompare(two) < 0;
+-- 
+2.6.2
+
diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm/default.nix
similarity index 75%
rename from pkgs/desktops/plasma-5.4/plasma-nm.nix
rename to pkgs/desktops/plasma-5.4/plasma-nm/default.nix
index 92b04e2af1fd..7e229d580524 100644
--- a/pkgs/desktops/plasma-5.4/plasma-nm.nix
+++ b/pkgs/desktops/plasma-5.4/plasma-nm/default.nix
@@ -1,5 +1,5 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kcompletion
-, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
+{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
+, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
 , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
 , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
 , kxmlgui, makeQtWrapper, mobile_broadband_provider_info
@@ -9,6 +9,12 @@
 
 plasmaPackage {
   name = "plasma-nm";
+  patches = [
+    (substituteAll {
+      src = ./0001-mobile-broadband-provider-info-path.patch;
+      inherit mobile_broadband_provider_info;
+    })
+  ];
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools