From 3de049f71d83be9c22d360408dc266d8da0c4893 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 19 Aug 2022 18:09:20 +0800
Subject: [PATCH 1/2] cinnamon.cinnamon-common: ensure caribou is in
 XDG_DATA_DIRS

Some of its layout files are required for constructing a keyboard model.

Closes #101881
---
 pkgs/desktops/cinnamon/cinnamon-common/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index efe46904ff96..f00731995859 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -184,6 +184,13 @@ stdenv.mkDerivation rec {
     patchShebangs src/data-to-c.pl
   '';
 
+  preFixup = ''
+    # https://github.com/NixOS/nixpkgs/issues/101881
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${gnome.caribou}/share"
+    )
+  '';
+
   passthru = {
     providedSessions = [ "cinnamon" "cinnamon2d" ];
   };

From d00b39e1747295b6be6b3dce7a64a80c6e3503da Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 19 Aug 2022 18:21:06 +0800
Subject: [PATCH 2/2] cinnamon.cinnamon-common: ensure xapp is available for
 cinnamon-desktop-editor

Closes #129946
Closes #177041
---
 pkgs/desktops/cinnamon/cinnamon-common/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index f00731995859..5b0deb32032f 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -147,6 +147,7 @@ stdenv.mkDerivation rec {
     intltool
     gtk-doc
     perl
+    python3.pkgs.wrapPython
   ];
 
   # use locales from cinnamon-translations (not using --localedir because datadir is used)
@@ -189,6 +190,10 @@ stdenv.mkDerivation rec {
     gappsWrapperArgs+=(
       --prefix XDG_DATA_DIRS : "${gnome.caribou}/share"
     )
+
+    # https://github.com/NixOS/nixpkgs/issues/129946
+    buildPythonPath "${python3.pkgs.xapp}"
+    patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
   '';
 
   passthru = {