diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-05-19 16:33:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-19 16:33:56 +0200 |
commit | a858f1a90d777483b28f90756ea9c6b393de299d (patch) | |
tree | 6f184d516547dbb6ae9d27d6d7cdccd839a2b955 /nixos/modules/services/x11 | |
parent | 6cf64704297f60ca6ab579a4135bb565bb514b06 (diff) | |
parent | ed47351533bbe26e0fd209817f2262fce747cab1 (diff) | |
download | nixpkgs-a858f1a90d777483b28f90756ea9c6b393de299d.tar nixpkgs-a858f1a90d777483b28f90756ea9c6b393de299d.tar.gz nixpkgs-a858f1a90d777483b28f90756ea9c6b393de299d.tar.bz2 nixpkgs-a858f1a90d777483b28f90756ea9c6b393de299d.tar.lz nixpkgs-a858f1a90d777483b28f90756ea9c6b393de299d.tar.xz nixpkgs-a858f1a90d777483b28f90756ea9c6b393de299d.tar.zst nixpkgs-a858f1a90d777483b28f90756ea9c6b393de299d.zip |
Merge pull request #123507 from jtojnar/no-flatpak-guipkgs
nixos/flatpak: Remove `guiPackages` internal option
Diffstat (limited to 'nixos/modules/services/x11')
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome.nix | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 5964bd1a52c..bacada9cbe7 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -292,11 +292,6 @@ in # If gnome is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; - - # Install gnome-software if flatpak is enabled - services.flatpak.guiPackages = [ - pkgs.gnome.gnome-software - ]; }) (mkIf flashbackEnabled { @@ -467,31 +462,39 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst (mkIf serviceCfg.core-utilities.enable { - environment.systemPackages = (with pkgs.gnome; removePackagesByName [ - baobab - cheese - eog - epiphany - gedit - gnome-calculator - gnome-calendar - gnome-characters - gnome-clocks - gnome-contacts - gnome-font-viewer - gnome-logs - gnome-maps - gnome-music - pkgs.gnome-photos - gnome-screenshot - gnome-system-monitor - gnome-weather - nautilus - pkgs.gnome-connections - simple-scan - totem - yelp - ] config.environment.gnome.excludePackages); + environment.systemPackages = + with pkgs.gnome; + removePackagesByName + ([ + baobab + cheese + eog + epiphany + gedit + gnome-calculator + gnome-calendar + gnome-characters + gnome-clocks + gnome-contacts + gnome-font-viewer + gnome-logs + gnome-maps + gnome-music + pkgs.gnome-photos + gnome-screenshot + gnome-system-monitor + gnome-weather + nautilus + pkgs.gnome-connections + simple-scan + totem + yelp + ] ++ lib.optionals config.services.flatpak.enable [ + # Since PackageKit Nix support is not there yet, + # only install gnome-software if flatpak is enabled. + gnome-software + ]) + config.environment.gnome.excludePackages; # Enable default program modules # Since some of these have a corresponding package, we only |