alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #75583 from worldofpeace/nm-applet-default-gnome

Browse source 
networkmanagerapplet: default to withGnome
This commit is contained in:
worldofpeace 2019-12-21 11:58:05 -05:00 committed by GitHub
parent b42bede861 f5081ecca6
commit e203d58403
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/programs/nm-applet.nix
View file

@ -10,5 +10,7 @@
partOf = [ "graphical-session.target" ];
serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet";
};
services.dbus.packages = [ pkgs.gcr ];
};
}

6
pkgs/desktops/gnome-3/default.nix
View file

@ -138,10 +138,6 @@ lib.makeScope pkgs.newScope (self: with self; {
withGnome = true;
};
networkmanagerapplet = pkgs.networkmanagerapplet.override {
withGnome = true;
};
rygel = callPackage ./core/rygel { };
simple-scan = callPackage ./core/simple-scan { };
@ -360,4 +356,6 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) yelp-tools; # added 2019-11-20
inherit (pkgs) dconf; # added 2019-11-30
inherit (pkgs) networkmanagerapplet; # added 2019-12-12
})

8
pkgs/desktops/pantheon/default.nix
View file

@ -155,9 +155,7 @@ lib.makeScope pkgs.newScope (self: with self; {
wingpanel-indicator-keyboard = callPackage ./desktop/wingpanel-indicators/keyboard { };
wingpanel-indicator-network = callPackage ./desktop/wingpanel-indicators/network {
inherit (gnome3) networkmanagerapplet;
};
wingpanel-indicator-network = callPackage ./desktop/wingpanel-indicators/network { };
wingpanel-indicator-nightlight = callPackage ./desktop/wingpanel-indicators/nightlight { };
@ -193,9 +191,7 @@ lib.makeScope pkgs.newScope (self: with self; {
switchboard-plug-mouse-touchpad = callPackage ./apps/switchboard-plugs/mouse-touchpad { };
switchboard-plug-network = callPackage ./apps/switchboard-plugs/network {
inherit (gnome3) networkmanagerapplet;
};
switchboard-plug-network = callPackage ./apps/switchboard-plugs/network { };
switchboard-plug-notifications = callPackage ./apps/switchboard-plugs/notifications { };

2
pkgs/tools/networking/network-manager/applet.nix
View file

@ -2,7 +2,7 @@
, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43
, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3
, libappindicator-gtk3, withGnome ? false, gcr, glib }:
, libappindicator-gtk3, withGnome ? true, gcr, glib }:
let
pname = "network-manager-applet";

4
pkgs/tools/networking/network-manager/fortisslvpn/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3,
networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch }:
networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }:
let
pname = "NetworkManager-fortisslvpn";
@ -25,7 +25,7 @@ in stdenv.mkDerivation {
];
buildInputs = [ openfortivpn networkmanager ppp ]
++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig file ];

4
pkgs/tools/networking/network-manager/iodine/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3
, withGnome ? true, gnome3, fetchpatch }:
, withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }:
let
pname = "NetworkManager-iodine";
@ -25,7 +25,7 @@ in stdenv.mkDerivation {
];
buildInputs = [ iodine networkmanager ]
++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig ];

4
pkgs/tools/networking/network-manager/openvpn/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret
, gtk3, withGnome ? true, gnome3, kmod, fetchpatch }:
, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, networkmanagerapplet }:
let
pname = "NetworkManager-openvpn";
@ -25,7 +25,7 @@ in stdenv.mkDerivation {
];
buildInputs = [ openvpn networkmanager ]
++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig file libxml2 ];

4
pkgs/tools/networking/network-manager/strongswan.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM
, gtk3, gnome3, libsecret }:
, gtk3, gnome3, libsecret, networkmanagerapplet }:
stdenv.mkDerivation rec {
pname = "NetworkManager-strongswan";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl";
};
buildInputs = [ networkmanager strongswanNM libsecret gtk3 gnome3.networkmanagerapplet ];
buildInputs = [ networkmanager strongswanNM libsecret gtk3 networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig ];

4
pkgs/tools/networking/network-manager/vpnc/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret
, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch }:
, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch, networkmanagerapplet }:
let
pname = "NetworkManager-vpnc";
version = "1.2.6";
@ -24,7 +24,7 @@ in stdenv.mkDerivation {
];
buildInputs = [ vpnc networkmanager ]
++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig file ];