push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,20 @@
--- a/src/nm-openconnect-service.c
+++ b/src/nm-openconnect-service.c
@@ -60,7 +60,7 @@
static const char *openconnect_binary_paths[] =
{
- "/usr/bin/openconnect",
+ "@openconnect@/bin/openconnect",
"/usr/sbin/openconnect",
"/usr/local/bin/openconnect",
"/usr/local/sbin/openconnect",
@@ -734,7 +734,7 @@
_LOGD ("nm-openconnect-service (version " DIST_VERSION ") starting...");
- if (system ("/sbin/modprobe tun") == -1)
+ if (system ("@kmod@/bin/modprobe tun") == -1)
exit (EXIT_FAILURE);
if (bus_name)

View File

@@ -0,0 +1,83 @@
{
stdenv,
lib,
fetchurl,
replaceVars,
glib,
libxml2,
openconnect,
intltool,
pkg-config,
networkmanager,
gcr,
libsecret,
file,
gtk3,
webkitgtk_4_1,
libnma,
libnma-gtk4,
gtk4,
withGnome ? true,
gnome,
kmod,
}:
stdenv.mkDerivation rec {
pname = "NetworkManager-openconnect";
version = "1.2.10";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager-openconnect/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "hEtr9k7K25e0pox3bbiapebuflm9JLAYAihAaGMTZGQ=";
};
patches = [
(replaceVars ./fix-paths.patch {
inherit kmod openconnect;
})
];
buildInputs = [
libxml2
openconnect
networkmanager
webkitgtk_4_1 # required, for SSO
]
++ lib.optionals withGnome [
gtk3
libnma
libnma-gtk4
gtk4
gcr
libsecret
];
nativeBuildInputs = [
glib
intltool
pkg-config
file
];
configureFlags = [
"--with-gnome=${if withGnome then "yes" else "no"}"
"--with-gtk4=${if withGnome then "yes" else "no"}"
"--enable-absolute-paths"
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "networkmanager-openconnect";
versionPolicy = "odd-unstable";
};
networkManagerPlugin = "VPN/nm-openconnect-service.name";
networkManagerRuntimeDeps = [ openconnect ];
};
meta = with lib; {
description = "NetworkManagers OpenConnect plugin";
inherit (networkmanager.meta) maintainers teams platforms;
license = licenses.gpl2Plus;
};
}