diff --git a/pkgs/tools/networking/networkmanager/openconnect/default.nix b/pkgs/tools/networking/networkmanager/openconnect/default.nix index c03a698514a8..e0199784b2bc 100644 --- a/pkgs/tools/networking/networkmanager/openconnect/default.nix +++ b/pkgs/tools/networking/networkmanager/openconnect/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , substituteAll , glib @@ -12,21 +13,21 @@ , libsecret , file , gtk3 +, libnma +, libnma-gtk4 +, gtk4 , withGnome ? true , gnome , kmod -, fetchpatch }: -let +stdenv.mkDerivation rec { pname = "NetworkManager-openconnect"; - version = "1.2.6"; -in stdenv.mkDerivation { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + version = "1.2.8"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m"; + url = "mirror://gnome/sources/NetworkManager-openconnect/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "Xe2qeF2C2OI53dCCv6xSUMaR6WRGS+GAe2gnJjYzzcw="; }; patches = [ @@ -34,12 +35,6 @@ in stdenv.mkDerivation { src = ./fix-paths.patch; inherit kmod openconnect; }) - - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/merge_requests/9.patch"; - sha256 = "0yd2dmq6gq6y4czr7dqdgaiqvw2vyv2gikznpfdxyfn2v1pcrk9m"; - }) ]; buildInputs = [ @@ -49,6 +44,9 @@ in stdenv.mkDerivation { networkmanager ] ++ lib.optionals withGnome [ gtk3 + libnma + libnma-gtk4 + gtk4 gcr libsecret ]; @@ -61,8 +59,8 @@ in stdenv.mkDerivation { configureFlags = [ "--with-gnome=${if withGnome then "yes" else "no"}" + "--with-gtk4=${if withGnome then "yes" else "no"}" "--enable-absolute-paths" - "--without-libnm-glib" ]; passthru = {