public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123507 from jtojnar/no-flatpak-guipkgs

Browse Source 
nixos/flatpak: Remove `guiPackages` internal option
This commit is contained in:
Jan Tojnar 2021-05-19 16:33:56 +02:00 committed by GitHub
commit a858f1a90d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/services/desktops/flatpak.nix
View File

@ -15,18 +15,6 @@ in {
options = { options = {
services.flatpak = { services.flatpak = {
enable = mkEnableOption "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 ]; services.dbus.packages = [ pkgs.flatpak ];

17
nixos/modules/services/x11/desktop-managers/gnome.nix
View File

@ -292,11 +292,6 @@ in
# If gnome is installed, build vim for gtk3 too. # If gnome is installed, build vim for gtk3 too.
nixpkgs.config.vim.gui = "gtk3"; nixpkgs.config.vim.gui = "gtk3";
# Install gnome-software if flatpak is enabled
services.flatpak.guiPackages = [
pkgs.gnome.gnome-software
];
}) })
(mkIf flashbackEnabled { (mkIf flashbackEnabled {
@ -467,7 +462,10 @@ in
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst # 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 { (mkIf serviceCfg.core-utilities.enable {
environment.systemPackages = (with pkgs.gnome; removePackagesByName [ environment.systemPackages =
with pkgs.gnome;
removePackagesByName
([
baobab baobab
cheese cheese
eog eog
@ -491,7 +489,12 @@ in
simple-scan simple-scan
totem totem
yelp yelp
] config.environment.gnome.excludePackages); ] ++ 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 # Enable default program modules
# Since some of these have a corresponding package, we only # Since some of these have a corresponding package, we only