From 9b47854f24b5235a7ed300c4039793875eb807ad Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 10 Jun 2020 15:22:35 +0200
Subject: networkmanager-fortisslvpn: more clean ups and fixes

* add GLib dependency (it works with graphical variant because it is propagated by GTK but we should include it explicitly).
* Since 1.2.10, libnm-glib support is disabled by default.
* Since 1.2.10, intltool is not used.

Closes: https://github.com/NixOS/nixpkgs/issues/90015
---
 pkgs/tools/networking/network-manager/fortisslvpn/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
index c0bb2a4276b5..3cc4133b41cf 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
@@ -2,9 +2,10 @@
 , fetchurl
 , substituteAll
 , openfortivpn
-, intltool
+, gettext
 , pkg-config
 , file
+, glib
 , gtk3
 , networkmanager
 , ppp
@@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    intltool
+    gettext
     pkg-config
     file
   ];
@@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
     openfortivpn
     networkmanager
     ppp
+    glib
   ] ++ stdenv.lib.optionals withGnome [
     gtk3
     libsecret
@@ -55,7 +57,6 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--without-libnm-glib"
     "--with-gnome=${if withGnome then "yes" else "no"}"
     "--localstatedir=/var"
     "--enable-absolute-paths"
-- 
cgit 1.4.1