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
This commit is contained in:
Jan Tojnar 2020-06-10 15:22:35 +02:00
parent dc318b393f
commit 9b47854f24
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -2,9 +2,10 @@
, fetchurl , fetchurl
, substituteAll , substituteAll
, openfortivpn , openfortivpn
, intltool , gettext
, pkg-config , pkg-config
, file , file
, glib
, gtk3 , gtk3
, networkmanager , networkmanager
, ppp , ppp
@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
intltool gettext
pkg-config pkg-config
file file
]; ];
@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
openfortivpn openfortivpn
networkmanager networkmanager
ppp ppp
glib
] ++ stdenv.lib.optionals withGnome [ ] ++ stdenv.lib.optionals withGnome [
gtk3 gtk3
libsecret libsecret
@ -55,7 +57,6 @@ stdenv.mkDerivation rec {
]; ];
configureFlags = [ configureFlags = [
"--without-libnm-glib"
"--with-gnome=${if withGnome then "yes" else "no"}" "--with-gnome=${if withGnome then "yes" else "no"}"
"--localstatedir=/var" "--localstatedir=/var"
"--enable-absolute-paths" "--enable-absolute-paths"