diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-05-18 13:53:10 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-18 14:06:23 +0200 |
commit | ed47351533bbe26e0fd209817f2262fce747cab1 (patch) | |
tree | e02607f6236e4e3d2d59ad6e2e4499aa48ccd97a | |
parent | c007fb402681460a57a05f314f4c659d409d2f45 (diff) | |
download | nixpkgs-ed47351533bbe26e0fd209817f2262fce747cab1.tar nixpkgs-ed47351533bbe26e0fd209817f2262fce747cab1.tar.gz nixpkgs-ed47351533bbe26e0fd209817f2262fce747cab1.tar.bz2 nixpkgs-ed47351533bbe26e0fd209817f2262fce747cab1.tar.lz nixpkgs-ed47351533bbe26e0fd209817f2262fce747cab1.tar.xz nixpkgs-ed47351533bbe26e0fd209817f2262fce747cab1.tar.zst nixpkgs-ed47351533bbe26e0fd209817f2262fce747cab1.zip |
nixos/flatpak: Remove `guiPackages` internal option
It was basically just a `environment.systemPackages` synonym, only GNOME used it, and it was stretching the responsibilities of the flatpak module too far. It also makes it cleaner to avoid installing the program using GNOME module’s `excludePackages` option. Partially reverts: https://github.com/NixOS/nixpkgs/pull/101516 Fixes: https://github.com/NixOS/nixpkgs/issues/110310
-rw-r--r-- | nixos/modules/services/desktops/flatpak.nix | 14 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome.nix | 63 |
2 files changed, 34 insertions, 43 deletions
diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index 20007a421b0..7da92cc9f26 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -15,18 +15,6 @@ in { options = { services.flatpak = { enable = mkEnableOption "flatpak"; - - guiPackages = mkOption { - internal = true; - type = types.listOf types.package; - default = []; - example = literalExample "[ pkgs.gnome.gnome-software ]"; - description = '' - Packages that provide an interface for flatpak - (like gnome-software) that will be automatically available - to all users when flatpak is enabled. - ''; - }; }; }; @@ -40,7 +28,7 @@ in { } ]; - environment.systemPackages = [ pkgs.flatpak ] ++ cfg.guiPackages; + environment.systemPackages = [ pkgs.flatpak ]; services.dbus.packages = [ pkgs.flatpak ]; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index d61d6ce50da..32687c6ccdc 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -291,11 +291,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 { @@ -466,31 +461,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 |