forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
plasma-nm: patch in the correct path to openvpn executable
Fixes NixOS#24808
- Loading branch information
Showing
2 changed files
with
18 additions
and
1 deletion.
There are no files selected for viewing
13 changes: 13 additions & 0 deletions
13
pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
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")); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters