ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

network-manager: Fix all plugins to use gnome3 and gtk3, like nm-applet does

Browse Source 
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.
This commit is contained in:
Jaka Hudoklin 2014-05-20 20:30:44 +02:00
parent bddd10d75c
commit 3673ba6150
6 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/network-manager/openconnect.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager { 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 { stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ openconnect networkmanager ] 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 ]; nativeBuildInputs = [ intltool pkgconfig ];
configureFlags = [ 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" "--disable-static"
]; ];

6
pkgs/tools/networking/network-manager/openvpn.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager { 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 { stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ openvpn networkmanager ] buildInputs = [ openvpn networkmanager ]
++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring ]; ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = [ intltool pkgconfig ];
configureFlags = [ 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" "--disable-static"
]; ];

6
pkgs/tools/networking/network-manager/pptp.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll { stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll
, withGnome ? false, gtk, libgnome_keyring }: , withGnome ? true, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ networkmanager pptp ppp ] buildInputs = [ networkmanager pptp ppp ]
++ stdenv.lib.optionals withGnome [ gtk libgnome_keyring ]; ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = [ intltool pkgconfig ];
configureFlags = 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"; postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile";

6
pkgs/tools/networking/network-manager/vpnc.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager { 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 { stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ vpnc networkmanager ] buildInputs = [ vpnc networkmanager ]
++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring ]; ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = [ intltool pkgconfig ];
configureFlags = [ 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" "--disable-static"
]; ];

4
pkgs/top-level/all-packages.nix
View File

@ -1565,11 +1565,9 @@ let
networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { };
networkmanager_pptp_gnome = networkmanager_pptp.override { withGnome = true; };
networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { };
networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { gconf = gnome.GConf; }; networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };
networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { };

1
pkgs/top-level/release-python.nix
View File

@ -1190,7 +1190,6 @@ let
networkmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; networkmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
networkmanagerapplet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; networkmanagerapplet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
networkmanager_pptp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; networkmanager_pptp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
networkmanager_pptp_gnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
neverball = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; neverball = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
nfsUtils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; nfsUtils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
ngspice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ngspice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };