diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-08-19 18:09:20 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-10-16 22:19:31 +0800 |
| commit | 438c357a78fefe6a955d3710dd1ab9a25ebee338 (patch) | |
| tree | 3f6e26b9bf216754aaf57abfcced0ec437a9e214 | |
| parent | cinnamon.cinnamon-common: fix msgfmt path for Spices.py (diff) | |
| download | nixpkgs-438c357a78fefe6a955d3710dd1ab9a25ebee338.tar.gz | |
cinnamon.cinnamon-common: ensure caribou is in XDG_DATA_DIRS
Some of its layout files are required for constructing a keyboard model.
Closes #101881
(cherry picked from commit 3de049f71d83be9c22d360408dc266d8da0c4893)
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 40a9677f6e40..331670299689 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -156,6 +156,13 @@ stdenv.mkDerivation rec { sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py ''; + preFixup = '' + # https://github.com/NixOS/nixpkgs/issues/101881 + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome.caribou}/share" + ) + ''; + passthru = { providedSessions = [ "cinnamon" "cinnamon2d" ]; }; |