From 8fae44de8fe6fd91f3db75c99958a57d529e27b1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 26 Apr 2022 16:53:47 +0200 Subject: [PATCH] =?UTF-8?q?networkmanager=5Fstrongswan:=201.5.2=20?= =?UTF-8?q?=E2=86=92=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/strongswan/strongswan/blob/846201a686cc1bab1405b0ea23d360279f49c2c4/src/frontends/gnome/NEWS#L1-L5 --- .../networking/networkmanager/strongswan/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix index 3201169e87e..e080ca17db1 100644 --- a/pkgs/tools/networking/networkmanager/strongswan/default.nix +++ b/pkgs/tools/networking/networkmanager/strongswan/default.nix @@ -6,18 +6,20 @@ , networkmanager , strongswanNM , gtk3 +, gtk4 , gnome , libsecret , libnma +, libnma-gtk4 }: stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2"; - sha256 = "0sc1yzlxjfvl58hjjw99bchqc4061i3apw254z61v22k4sajnif8"; + sha256 = "bbyA9qCboM9hBKMXhJWXgEFN13Fl4pY6zWZXwowlRMI="; }; nativeBuildInputs = [ @@ -30,14 +32,16 @@ stdenv.mkDerivation rec { strongswanNM libsecret gtk3 + gtk4 libnma + libnma-gtk4 ]; configureFlags = [ - "--without-libnm-glib" "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" "--with-nm-libexecdir=${placeholder "out"}/libexec" "--with-nm-plugindir=${placeholder "out"}/lib/NetworkManager" + "--with-gtk4" ]; PKG_CONFIG_LIBNM_VPNSERVICEDIR = "${placeholder "out"}/lib/NetworkManager/VPN";