diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-06-10 15:22:35 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-06-10 15:31:09 +0200 |
commit | 9b47854f24b5235a7ed300c4039793875eb807ad (patch) | |
tree | 3f0b548cff3ed284efc5731a472c3b19572b5aa8 /pkgs/tools | |
parent | dc318b393feb004890c18a6683fe66af25a54ad2 (diff) | |
download | nixlib-9b47854f24b5235a7ed300c4039793875eb807ad.tar nixlib-9b47854f24b5235a7ed300c4039793875eb807ad.tar.gz nixlib-9b47854f24b5235a7ed300c4039793875eb807ad.tar.bz2 nixlib-9b47854f24b5235a7ed300c4039793875eb807ad.tar.lz nixlib-9b47854f24b5235a7ed300c4039793875eb807ad.tar.xz nixlib-9b47854f24b5235a7ed300c4039793875eb807ad.tar.zst nixlib-9b47854f24b5235a7ed300c4039793875eb807ad.zip |
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
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/network-manager/fortisslvpn/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
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" |