tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

plasma-nm: update patches

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

Yaroslav Bolyukin 00a83105 697277d7

+1 -30
unified split
-25
pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
··· 1 - From faf13c97ff1192a201843b9d52f4002dbd9022af Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@gmail.com> 3 - Date: Sun, 25 Oct 2015 09:09:27 -0500 4 - Subject: [PATCH] mobile-broadband-provider-info path 5 - 6 - --- 7 - libs/editor/mobileproviders.cpp | 2 +- 8 - 1 file changed, 1 insertion(+), 1 deletion(-) 9 - 10 - diff --git a/libs/editor/mobileproviders.cpp b/libs/editor/mobileproviders.cpp 11 - index 568cb34..98a5992 100644 12 - --- a/libs/editor/mobileproviders.cpp 13 - +++ b/libs/editor/mobileproviders.cpp 14 - @@ -26,7 +26,7 @@ 15 - 16 - #include <KLocale> 17 - 18 - -const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml"; 19 - +const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml"; 20 - 21 - bool localeAwareCompare(const QString & one, const QString & two) { 22 - return one.localeAwareCompare(two) < 0; 23 - -- 24 - 2.6.2 25 -
+1 -1
pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
··· 6 6 connect(m_ui->cmbProxyType, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged); 7 7 8 8 // start openVPN process and get its cipher list 9 - - const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList() << "/sbin" << "/usr/sbin"); 9 + - const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList{"/sbin", "/usr/sbin"}); 10 10 + const QString openVpnBinary = "@openvpn@/bin/openvpn"; 11 11 const QStringList ciphersArgs(QLatin1String("--show-ciphers")); 12 12 const QStringList versionArgs(QLatin1String("--version"));
-4
pkgs/desktops/plasma-5/plasma-nm/default.nix
··· 25 25 ]; 26 26 patches = [ 27 27 (substituteAll { 28 - src = ./0001-mobile-broadband-provider-info-path.patch; 29 - mobile_broadband_provider_info = mobile-broadband-provider-info; 30 - }) 31 - (substituteAll { 32 28 src = ./0002-openvpn-binary-path.patch; 33 29 inherit openvpn; 34 30 })