mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 07:34:11 +00:00
bdf6f8528e
When creating a new mobile broadband connection
with the plasma network manager connection editor,
it tries to find a file containing provider
information somewhere in /usr/share/... .
The build recipe contains a patch to fix the lookup path
such that it finds the file in the corresponding package,
probably added due to
https://github.com/NixOS/nixpkgs/issues/9389 .
The actual lookup path is injected into
the patch file with substituteAll.
With commit a31d98f312 ,
the variable name used in subsituteAll changed from
mobile_broadband_provider_info to mobile-broadband-provider-info
(underscores in package names turned into dashes).
Apparently, substituteAll can't handle dashes in variable names.
Consequently, the variable name was no longer resolved.
plasma-nm failed to create new mobile broadband connections;
the connection creator silently exited and logged the error
> plasma-nm: Error opening providers file "@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"
This commit keeps the dashes in package names, but it
restores the underscores in the variable used by substituteAll,
thereby ensuring the variable gets resolved properly.
26 lines
905 B
Diff
26 lines
905 B
Diff
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
|
|
|