diff options
| author | Yaroslav Bolyukin <iam@lach.pw> | 2021-09-27 22:53:49 +0300 |
|---|---|---|
| committer | Yaroslav Bolyukin <iam@lach.pw> | 2021-10-22 23:22:23 +0300 |
| commit | 00a831052345435ddc9cefd0f4cbbe99cfd83a81 (patch) | |
| tree | 6b43d707721f3bf0d99296e669c7df6785ebd990 /pkgs/desktops/plasma-5 | |
| parent | 697277d7da81d43d7d56eff96969a0cfb0610ff6 (diff) | |
| download | nixpkgs-00a831052345435ddc9cefd0f4cbbe99cfd83a81.tar nixpkgs-00a831052345435ddc9cefd0f4cbbe99cfd83a81.tar.gz nixpkgs-00a831052345435ddc9cefd0f4cbbe99cfd83a81.tar.bz2 nixpkgs-00a831052345435ddc9cefd0f4cbbe99cfd83a81.tar.lz nixpkgs-00a831052345435ddc9cefd0f4cbbe99cfd83a81.tar.xz nixpkgs-00a831052345435ddc9cefd0f4cbbe99cfd83a81.tar.zst nixpkgs-00a831052345435ddc9cefd0f4cbbe99cfd83a81.zip | |
plasma-nm: update patches
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Diffstat (limited to 'pkgs/desktops/plasma-5')
3 files changed, 1 insertions, 30 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch deleted file mode 100644 index 79b5cfb437e..00000000000 --- a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch +++ /dev/null @@ -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 - diff --git a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch index 3bc871f0906..c32e73bc2c6 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch +++ b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch @@ -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")); diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index e563bdd837e..5c82112f3b1 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -25,10 +25,6 @@ mkDerivation { ]; 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; }) |