diff options
author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-05-20 20:30:44 +0200 |
---|---|---|
committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-05-20 20:37:29 +0200 |
commit | 3673ba615001b3fe017fe947fad4c20da60faaf6 (patch) | |
tree | 4d634b6231f576e75e7a156120431d36fc83faaa /pkgs/tools/networking/network-manager/openconnect.nix | |
parent | bddd10d75c333fd09efc89a268067173ec1fc6b4 (diff) | |
download | nixlib-3673ba615001b3fe017fe947fad4c20da60faaf6.tar nixlib-3673ba615001b3fe017fe947fad4c20da60faaf6.tar.gz nixlib-3673ba615001b3fe017fe947fad4c20da60faaf6.tar.bz2 nixlib-3673ba615001b3fe017fe947fad4c20da60faaf6.tar.lz nixlib-3673ba615001b3fe017fe947fad4c20da60faaf6.tar.xz nixlib-3673ba615001b3fe017fe947fad4c20da60faaf6.tar.zst nixlib-3673ba615001b3fe017fe947fad4c20da60faaf6.zip |
network-manager: Fix all plugins to use gnome3 and gtk3, like nm-applet does
I think this makes sense, because now all the plugins will be gnome3 gtk3 based, the same way nm-applet is. I also removed networkmanager_pptp_gnome variation of networkmanager_pptp package, because i think no variation is needed and gnome support should be on by default like in other packages.
Diffstat (limited to 'pkgs/tools/networking/network-manager/openconnect.nix')
-rw-r--r-- | pkgs/tools/networking/network-manager/openconnect.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index ff4c853512d6..cc6532bac719 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager -, withGnome ? true, gtk2, gconf, libgnome_keyring, procps, module_init_tools }: +, withGnome ? true, gnome3, procps, module_init_tools }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ openconnect networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring gconf ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf ]; nativeBuildInputs = [ intltool pkgconfig ]; configureFlags = [ - "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}" + "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}" "--disable-static" ]; |