ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 06:14:26 +03:00
Code Issues Projects Releases Wiki Activity

plasma-nm: path to mobile-broadband-provider-info

Browse Source 
Fixes #9389.
This commit is contained in:
Thomas Tuegel 2015-10-25 09:16:25 -05:00
parent 713ae1063a
commit 892b7c451f
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/plasma-5.4/default.nix
View File

@ -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 {};

25
pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch Normal file
View File

@ -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

10
pkgs/desktops/plasma-5.4/plasma-nm.nix → pkgs/desktops/plasma-5.4/plasma-nm/default.nix
View File

@ -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