diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-22 11:04:28 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-22 11:04:28 +0200 |
| commit | 6c72782d364149c7cfea1ea69fdbc1133acc80b5 (patch) | |
| tree | ffb22d1fb7e0f1432c0f4e4063759d61a8bf6e0c /pkgs/tools/networking | |
| parent | b21994d4ac9c2c8d372bf011668401ee31972c0b (diff) | |
| parent | 452017032ac8af0c5e09d5abbf7a562ae524fea7 (diff) | |
| download | nixlib-6c72782d364149c7cfea1ea69fdbc1133acc80b5.tar nixlib-6c72782d364149c7cfea1ea69fdbc1133acc80b5.tar.gz nixlib-6c72782d364149c7cfea1ea69fdbc1133acc80b5.tar.bz2 nixlib-6c72782d364149c7cfea1ea69fdbc1133acc80b5.tar.lz nixlib-6c72782d364149c7cfea1ea69fdbc1133acc80b5.tar.xz nixlib-6c72782d364149c7cfea1ea69fdbc1133acc80b5.tar.zst nixlib-6c72782d364149c7cfea1ea69fdbc1133acc80b5.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/network-manager/fortisslvpn.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/openconnect.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix index 54046a23b7df..ab49514d720b 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; nativeBuildInputs = [ automake autoconf intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 27fd4c4adc30..ad15723dd331 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ openconnect networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring ]; nativeBuildInputs = [ intltool pkgconfig ]; |