diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-05-04 23:24:13 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-05-04 23:29:42 +0200 |
| commit | ec0ae174f8b273e024341d2ffbf2e9e58d30c706 (patch) | |
| tree | 62c19c998e4d0ab8ad5ce7d50cbda398c43c0d97 /pkgs/desktops | |
| parent | ab0bd3aff91e64bbeab321b5a182ca24428de937 (diff) | |
Revert "networkmanager-applet: rename from networkmanagerapplet"
network-manager-applet uses differrent naming scheme from the VPN plug-ins. Let’s revert to the previous state, for now, to fix eval. We can do the rename later. This reverts commit cecb014d5daeb8b0c75361ed8ba89d9e84279c8e.
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome/core/gnome-control-center/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 1d2597c02dbbc..c7da1e43a15cd 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -42,7 +42,7 @@ , modemmanager , mutter , networkmanager -, networkmanager-applet +, networkmanagerapplet , libnma-gtk4 , ninja , pkg-config @@ -76,9 +76,8 @@ stdenv.mkDerivation rec { src = ./paths.patch; gcm = gnome-color-manager; gnome_desktop = gnome-desktop; - networkmanagerapplet = networkmanager-applet; inherit glibc libgnomekbd tzdata; - inherit cups; + inherit cups networkmanagerapplet; }) # Fix Online Accounts configuration on X11 diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 1b5c452288f4e..a0561ca00300b 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -379,7 +379,7 @@ lib.makeScope pkgs.newScope (self: with self; { dconf = throw "The ‘gnome.dconf’ alias was removed on 2022-01-13. Please use ‘pkgs.dconf’ directly."; # added 2019-11-30 - networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanager-applet’ directly."; # added 2019-12-12 + networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanagerapplet’ directly."; # added 2019-12-12 glade = throw "The ‘gnome.glade’ alias was removed on 2022-01-13. Please use ‘pkgs.glade’ directly."; # added 2020-05-15 diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 0f93d30b19beb..fbad5aa7a0120 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -11,7 +11,7 @@ , granite , gtk3 , networkmanager -, networkmanager-applet +, networkmanagerapplet , libnma , switchboard }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - networkmanagerapplet = networkmanager-applet; + inherit networkmanagerapplet; }) ]; |