b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #187434 from bobby285271/cinnamon

Browse source
This commit is contained in:
Maciej Krüger 2022-08-19 14:33:32 +02:00 committed by GitHub
parent 9389e01280 d00b39e174
commit a5de565921
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View file

@ -147,6 +147,7 @@ stdenv.mkDerivation rec {
intltool intltool
gtk-doc gtk-doc
perl perl
python3.pkgs.wrapPython
]; ];
# use locales from cinnamon-translations (not using --localedir because datadir is used) # use locales from cinnamon-translations (not using --localedir because datadir is used)
@ -184,6 +185,17 @@ stdenv.mkDerivation rec {
patchShebangs src/data-to-c.pl patchShebangs src/data-to-c.pl
''; '';
preFixup = ''
# https://github.com/NixOS/nixpkgs/issues/101881
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 = { passthru = {
providedSessions = [ "cinnamon" "cinnamon2d" ]; providedSessions = [ "cinnamon" "cinnamon2d" ];
}; };