uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -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"));
|
||||
|
||||
32
pkgs/desktops/plasma-5/plasma-nm/default.nix
Normal file
32
pkgs/desktops/plasma-5/plasma-nm/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
mkDerivation, lib, substituteAll,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative,
|
||||
ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet,
|
||||
kwidgetsaddons, kwindowsystem, kxmlgui, plasma-framework, prison, solid,
|
||||
|
||||
mobile-broadband-provider-info, openconnect, openvpn,
|
||||
modemmanager-qt, networkmanager-qt, qca-qt5,
|
||||
qtbase, qtdeclarative, qttools,
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "plasma-nm";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
|
||||
buildInputs = [
|
||||
kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion
|
||||
kconfigwidgets kcoreaddons kdbusaddons kiconthemes
|
||||
kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
|
||||
prison solid
|
||||
|
||||
qtdeclarative
|
||||
modemmanager-qt networkmanager-qt qca-qt5
|
||||
mobile-broadband-provider-info openconnect
|
||||
];
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./0002-openvpn-binary-path.patch;
|
||||
inherit openvpn;
|
||||
})
|
||||
];
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue