From 3de049f71d83be9c22d360408dc266d8da0c4893 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 19 Aug 2022 18:09:20 +0800 Subject: [PATCH] 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" ]; };