summary refs log tree commit diff
path: root/nixos/modules/services/x11/desktop-managers
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-02-09 21:22:05 +0800
committerBobby Rong <rjl931189261@126.com>2022-02-09 21:22:05 +0800
commitbb357d8203cc901bf1e729ec544c8c8b52cc329d (patch)
tree2bc3c39f83bcad31b05051fb9e726d116738bfce /nixos/modules/services/x11/desktop-managers
parent59dc15a3d8678332e70086d568695aea0fe24cfe (diff)
downloadnixpkgs-bb357d8203cc901bf1e729ec544c8c8b52cc329d.tar
nixpkgs-bb357d8203cc901bf1e729ec544c8c8b52cc329d.tar.gz
nixpkgs-bb357d8203cc901bf1e729ec544c8c8b52cc329d.tar.bz2
nixpkgs-bb357d8203cc901bf1e729ec544c8c8b52cc329d.tar.lz
nixpkgs-bb357d8203cc901bf1e729ec544c8c8b52cc329d.tar.xz
nixpkgs-bb357d8203cc901bf1e729ec544c8c8b52cc329d.tar.zst
nixpkgs-bb357d8203cc901bf1e729ec544c8c8b52cc329d.zip
nixos/pantheon: install appcenter if flatpak is enabled
This is how nixos/gnome handle gnome-software.
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers')
-rw-r--r--nixos/modules/services/x11/desktop-managers/pantheon.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index b9b0a7f514b..6a7d2a8aa6c 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -273,7 +273,7 @@ in
     })
 
     (mkIf serviceCfg.apps.enable {
-      environment.systemPackages = (with pkgs.pantheon; pkgs.gnome.removePackagesByName [
+      environment.systemPackages = with pkgs.pantheon; pkgs.gnome.removePackagesByName ([
         elementary-calculator
         elementary-calendar
         elementary-camera
@@ -287,7 +287,11 @@ in
         elementary-terminal
         elementary-videos
         epiphany
-      ] config.environment.pantheon.excludePackages);
+      ] ++ lib.optionals config.services.flatpak.enable [
+        # Only install appcenter if flatpak is enabled before
+        # https://github.com/NixOS/nixpkgs/issues/15932 is resolved.
+        appcenter
+      ]) config.environment.pantheon.excludePackages;
 
       # needed by screenshot
       fonts.fonts = [