(cherry picked from commit 51dc1ddb7c) Conflicts: pkgs/tools/networking/network-manager-applet/default.nix
51dc1ddb7c