nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsForQt5.libqofono: fix substituteAll usage

Browse Source
This commit is contained in:
K900 2024-10-20 18:51:57 +03:00
parent 3c7d6adcc8
commit 1f0044428f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch
View File

@ -16,7 +16,7 @@ index b5877ed..455167c 100644
QString provider = providerString; QString provider = providerString;
- query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml")); - query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml"));
+ query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml")); + query.setFocus(QUrl("@mobileBroadbandProviderInfo@/share/mobile-broadband-provider-info/serviceproviders.xml"));
if (provider.contains("\'")) { if (provider.contains("\'")) {
provider = provider.replace("\'", "'"); provider = provider.replace("\'", "'");
@ -25,7 +25,7 @@ index b5877ed..455167c 100644
#ifdef QOFONO_PROVISIONING #ifdef QOFONO_PROVISIONING
QXmlQuery query; QXmlQuery query;
- query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml")); - query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml"));
+ query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml")); + query.setFocus(QUrl("@mobileBroadbandProviderInfo@/share/mobile-broadband-provider-info/serviceproviders.xml"));
QString providerStr = provider; QString providerStr = provider;
if (providerStr.contains("\'")) { if (providerStr.contains("\'")) {

2
pkgs/development/libraries/libqofono/default.nix
View File

@ -23,7 +23,7 @@ mkDerivation rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch; src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch;
inherit mobile-broadband-provider-info; mobileBroadbandProviderInfo = mobile-broadband-provider-info;
}) })
./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch ./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch
]; ];