mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-01 05:04:40 +00:00
27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
diff --git a/vpn/l2tp/l2tpipsecwidget.cpp b/vpn/l2tp/l2tpipsecwidget.cpp
|
|
index bcc92dfd6..6708128fa 100644
|
|
--- a/vpn/l2tp/l2tpipsecwidget.cpp
|
|
+++ b/vpn/l2tp/l2tpipsecwidget.cpp
|
|
@@ -387,7 +387,7 @@ bool L2tpIpsecWidget::hasIpsecDaemon()
|
|
return true;
|
|
}
|
|
|
|
- QString ipsecBinary = QStandardPaths::findExecutable(QStringLiteral("ipsec"), QStringList() << QStringLiteral("/sbin") << QStringLiteral("/usr/sbin"));
|
|
+ QString ipsecBinary = "@ipsec@";
|
|
|
|
// On some Linux distributions, ipsec executable has been renamed strongswan
|
|
if (ipsecBinary.isEmpty()) {
|
|
diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp
|
|
index a1c2c553d..111f6138c 100644
|
|
--- a/vpn/openvpn/openvpnadvancedwidget.cpp
|
|
+++ b/vpn/openvpn/openvpnadvancedwidget.cpp
|
|
@@ -102,7 +102,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P
|
|
});
|
|
|
|
// start openVPN process and get its cipher list
|
|
- const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList{"/sbin", "/usr/sbin"});
|
|
+ const QString openVpnBinary = "@openvpn@";
|
|
const QStringList ciphersArgs(QLatin1String("--show-ciphers"));
|
|
const QStringList versionArgs(QLatin1String("--version"));
|
|
|