b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

plasma-nm: update patches

Browse source 
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
This commit is contained in:
Yaroslav Bolyukin 2021-09-27 22:53:49 +03:00
parent 697277d7da
commit 00a8310523
No known key found for this signature in database
GPG key ID: 40B5D6948143175F
3 changed files with 1 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,25 +0,0 @@
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

2
pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
View file

@ -6,7 +6,7 @@ index 2f11ba1d..310f11b4 100644
connect(m_ui->cmbProxyType, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged);
// start openVPN process and get its cipher list
- const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList() << "/sbin" << "/usr/sbin");
- const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList{"/sbin", "/usr/sbin"});
+ const QString openVpnBinary = "@openvpn@/bin/openvpn";
const QStringList ciphersArgs(QLatin1String("--show-ciphers"));
const QStringList versionArgs(QLatin1String("--version"));

4
pkgs/desktops/plasma-5/plasma-nm/default.nix
View file

@ -24,10 +24,6 @@ mkDerivation {
mobile-broadband-provider-info openconnect
];
patches = [
(substituteAll {
src = ./0001-mobile-broadband-provider-info-path.patch;
mobile_broadband_provider_info = mobile-broadband-provider-info;
})
(substituteAll {
src = ./0002-openvpn-binary-path.patch;
inherit openvpn;