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
78
pkgs/tools/networking/networkmanager/openvpn/default.nix
Normal file
78
pkgs/tools/networking/networkmanager/openvpn/default.nix
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, substituteAll
|
||||
, openvpn
|
||||
, intltool
|
||||
, libxml2
|
||||
, pkg-config
|
||||
, file
|
||||
, networkmanager
|
||||
, libsecret
|
||||
, glib
|
||||
, gtk3
|
||||
, gtk4
|
||||
, withGnome ? true
|
||||
, gnome
|
||||
, kmod
|
||||
, libnma
|
||||
, libnma-gtk4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "NetworkManager-openvpn";
|
||||
version = "1.8.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "U9+wrPZEeK3HKAdPFi9i5gv/YqYFvYl+uIsmfnBXkno=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
inherit kmod openvpn;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
intltool
|
||||
pkg-config
|
||||
file
|
||||
libxml2
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openvpn
|
||||
networkmanager
|
||||
glib
|
||||
] ++ lib.optionals withGnome [
|
||||
gtk3
|
||||
gtk4
|
||||
libsecret
|
||||
libnma
|
||||
libnma-gtk4
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-gnome=${if withGnome then "yes" else "no"}"
|
||||
"--with-gtk4=${if withGnome then "yes" else "no"}"
|
||||
"--localstatedir=/" # needed for the management socket under /run/NetworkManager
|
||||
"--enable-absolute-paths"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanager-openvpn";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
networkManagerPlugin = "VPN/nm-openvpn-service.name";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "NetworkManager's OpenVPN plugin";
|
||||
inherit (networkmanager.meta) maintainers platforms;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
34
pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch
Normal file
34
pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
--- a/properties/nm-openvpn-editor.c
|
||||
+++ b/properties/nm-openvpn-editor.c
|
||||
@@ -775,8 +775,7 @@
|
||||
nm_find_openvpn (void)
|
||||
{
|
||||
static const char *openvpn_binary_paths[] = {
|
||||
- "/usr/sbin/openvpn",
|
||||
- "/sbin/openvpn",
|
||||
+ "@openvpn@/bin/openvpn",
|
||||
NULL
|
||||
};
|
||||
const char **openvpn_binary = openvpn_binary_paths;
|
||||
--- a/src/nm-openvpn-service.c
|
||||
+++ b/src/nm-openvpn-service.c
|
||||
@@ -522,9 +522,7 @@
|
||||
openvpn_binary_find_exepath (void)
|
||||
{
|
||||
static const char *paths[] = {
|
||||
- "/usr/sbin/openvpn",
|
||||
- "/sbin/openvpn",
|
||||
- "/usr/local/sbin/openvpn",
|
||||
+ "@openvpn@/bin/openvpn",
|
||||
};
|
||||
int i;
|
||||
|
||||
@@ -2326,7 +2324,7 @@
|
||||
_LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting...");
|
||||
|
||||
if ( !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS)
|
||||
- && (system ("/sbin/modprobe tun") == -1))
|
||||
+ && (system ("@kmod@/bin/modprobe tun") == -1))
|
||||
return EXIT_FAILURE;
|
||||
|
||||
plugin = nm_openvpn_plugin_new (bus_name);
|
||||
Loading…
Add table
Add a link
Reference in a new issue