diff options
Diffstat (limited to 'pkgs/tools/networking')
4 files changed, 12 insertions, 12 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" ]; diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 821e72d49085..bb837dc6b8f1 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager -, withGnome ? true, gtk2, 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 = [ openvpn networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ]; 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" ]; diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index d0a92b78309d..6928db809a85 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll -, withGnome ? false, gtk, libgnome_keyring }: +, withGnome ? true, gnome3 }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ networkmanager pptp ppp ] - ++ stdenv.lib.optionals withGnome [ gtk libgnome_keyring ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ]; 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"; postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile"; diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 10a497e0238f..809970ff0fd6 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager -, withGnome ? true, gtk2, libgnome_keyring, procps, module_init_tools }: +, withGnome ? true, gnome3, procps, module_init_tools }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ vpnc networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ]; 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" ]; |