treewide: rename cinnamon.xapps to cinnamon.xapp

https://github.com/linuxmint/xapps redirects to https://github.com/linuxmint/xapp, and the meson project name is xapp.

1 files changed, 6 insertions, 3 deletions

diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 7f9d332ed14..5a803c6d487 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib }:
+{ config, pkgs, lib }:
 
 lib.makeScope pkgs.newScope (self: with self; {
   iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs (p: p // {
@@ -31,8 +31,11 @@ lib.makeScope pkgs.newScope (self: with self; {
   mint-y-icons = callPackage ./mint-y-icons { };
   muffin = callPackage ./muffin { };
   pix = callPackage ./pix { };
-  xapps = callPackage ./xapps { };
+  xapp = callPackage ./xapp { };
   warpinator = callPackage ./warpinator { };
   xreader = callPackage ./xreader { };
   xviewer = callPackage ./xviewer { };
-})
+}) // lib.optionalAttrs config.allowAliases {
+  # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
+  xapps = pkgs.cinnamon.xapp; # added 2022-07-27
+}