Merge pull request #24816 from benley/plasma-nm

plasma-nm: Fix cipher discovery by setting path to openvpn

Changed files
+19 -1
pkgs
desktops
+13
pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
···
+
diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp
+
index 2f11ba1d..310f11b4 100644
+
--- a/vpn/openvpn/openvpnadvancedwidget.cpp
+
+++ b/vpn/openvpn/openvpnadvancedwidget.cpp
+
@@ -75,7 +75,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P
+
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 = "@openvpn@/bin/openvpn";
+
const QStringList ciphersArgs(QLatin1String("--show-ciphers"));
+
const QStringList versionArgs(QLatin1String("--version"));
+
+6 -1
pkgs/desktops/plasma-5/plasma-nm/default.nix
···
, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
, kxmlgui, mobile_broadband_provider_info
, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
-
, qca-qt5, qtdeclarative, solid
+
, qca-qt5, qtdeclarative, solid, openvpn
}:
plasmaPackage {
···
src = ./0001-mobile-broadband-provider-info-path.patch;
inherit mobile_broadband_provider_info;
})
+
(substituteAll {
+
src = ./0002-openvpn-binary-path.patch;
+
inherit openvpn;
+
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
···
mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
qca-qt5 solid
];
+
enableParallelBuilding = true;
}