diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index f97bac13cf7f..e9608741816f 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , substituteAll , openfortivpn @@ -7,23 +8,24 @@ , file , glib , gtk3 +, gtk4 , networkmanager , ppp , libsecret , withGnome ? true , gnome -, fetchpatch , libnma +, libnma-gtk4 }: stdenv.mkDerivation rec { pname = "NetworkManager-fortisslvpn"; - version = "1.2.10"; + version = "1.4.0"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sw66cxgs4in4cjp1cm95c5ijsk8xbbmq4ykg2jwqwgz6cf2lr3s"; + sha256 = "sFXiY0m1FrI1hXmKs+9XtDawFIAOkqiscyz8jnbF2vo="; }; patches = [ @@ -31,12 +33,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit openfortivpn; }) - - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/merge_requests/11.patch"; - sha256 = "0l7l2r1njh62lh2pf497ibf99sgkvjsj58xr76qx3jxgq9zfw6n9"; - }) ]; nativeBuildInputs = [ @@ -52,12 +48,15 @@ stdenv.mkDerivation rec { 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=/var" "--enable-absolute-paths" ]; |