diff options
author | Bobby Rong <rjl931189261@126.com> | 2022-02-10 12:56:27 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-10 12:56:27 +0800 |
commit | 4118c7ad03728e34a7b21feb30075dfadbddb970 (patch) | |
tree | 9fb257699655ab1e2b610c7c0e3633d61f8b28ba /nixos/modules/services/x11 | |
parent | 063680580c5950e855ffff39d1609c67313f0218 (diff) | |
parent | 767370c47823abb55b92df89056b5a47494d963e (diff) | |
download | nixpkgs-4118c7ad03728e34a7b21feb30075dfadbddb970.tar nixpkgs-4118c7ad03728e34a7b21feb30075dfadbddb970.tar.gz nixpkgs-4118c7ad03728e34a7b21feb30075dfadbddb970.tar.bz2 nixpkgs-4118c7ad03728e34a7b21feb30075dfadbddb970.tar.lz nixpkgs-4118c7ad03728e34a7b21feb30075dfadbddb970.tar.xz nixpkgs-4118c7ad03728e34a7b21feb30075dfadbddb970.tar.zst nixpkgs-4118c7ad03728e34a7b21feb30075dfadbddb970.zip |
Merge pull request #158787: Pantheon: enable packagekit and drop appcenter patch
Diffstat (limited to 'nixos/modules/services/x11')
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/pantheon.nix | 9 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/pantheon.xml | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 70911e02f7e..6a7d2a8aa6c 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -135,6 +135,7 @@ in services.bamf.enable = true; services.colord.enable = mkDefault true; services.fwupd.enable = mkDefault true; + services.packagekit.enable = mkDefault true; services.touchegg.enable = mkDefault true; services.touchegg.package = pkgs.pantheon.touchegg; services.tumbler.enable = mkDefault true; @@ -272,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 @@ -286,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 = [ diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml index fe0a1c49622..202909d398f 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -105,10 +105,10 @@ switchboard-with-plugs.override { </term> <listitem> <para> - AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. See this <link xlink:href="https://github.com/NixOS/nixpkgs/issues/70214">issue</link>. + AppCenter has been available since 20.03. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. However, due to missing appstream metadata, the Packagekit backend does not function currently. See this <link xlink:href="https://github.com/NixOS/nixpkgs/issues/15932">issue</link>. </para> <para> - To use AppCenter on NixOS, add <literal>pantheon.appcenter</literal> to <xref linkend="opt-environment.systemPackages" />, <link linkend="module-services-flatpak">enable Flatpak support</link> and optionally add the <literal>appcenter</literal> Flatpak remote: + If you are using Pantheon, AppCenter should be installed by default if you have <link linkend="module-services-flatpak">Flatpak support</link> enabled. If you also wish to add the <literal>appcenter</literal> Flatpak remote: </para> <screen> <prompt>$ </prompt>flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo |