Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[22.05] cinnamon.cinnamon-common: many fixes #196285

Merged
merged 6 commits into from
Oct 17, 2022
Merged

[22.05] cinnamon.cinnamon-common: many fixes #196285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
13f6362
cinnamon.cinnamon-common: fix msgfmt path for Spices.py
bobby285271 Aug 15, 2022
438c357
cinnamon.cinnamon-common: ensure caribou is in XDG_DATA_DIRS
bobby285271 Aug 19, 2022
8ec26bc
cinnamon.cinnamon-common: ensure xapp is available for cinnamon-deskt…
bobby285271 Aug 19, 2022
1bc7436
cinnamon.cinnamon-common: Fix upload-system-info path
bobby285271 Sep 12, 2022
f73c9bd
cinnamon.cinnamon-common: Fix locking from menu
bobby285271 Oct 6, 2022
20f0a28
maintainers: add bobby285271 to cinnamon maintainer
bobby285271 Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions maintainers/team-list.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ with lib.maintainers; {

cinnamon = {
members = [
bobby285271
mkg20001
];
scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team.";
Expand Down
21 changes: 20 additions & 1 deletion pkgs/desktops/cinnamon/cinnamon-common/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
, cjs
, fetchFromGitHub
, gdk-pixbuf
, gettext
, libgnomekbd
, glib
, gobject-introspection
Expand Down Expand Up @@ -120,6 +121,7 @@ stdenv.mkDerivation rec {
wrapGAppsHook
intltool
gtk-doc
python3.pkgs.wrapPython
];

# use locales from cinnamon-translations (not using --localedir because datadir is used)
Expand All @@ -136,9 +138,13 @@ stdenv.mkDerivation rec {
sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py

sed "s|/usr/bin/upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
sed "s|upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
sed "s|\"upload-system-info\"|\"${xapps}/bin/upload-system-info\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py

sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings

sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \
-i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js

# this one really IS optional
sed "s|/usr/bin/gnome-control-center|/run/current-system/sw/bin/gnome-control-center|g" -i ./files/usr/bin/cinnamon-settings

Expand All @@ -151,6 +157,19 @@ stdenv.mkDerivation rec {

sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon -i ./files/usr/bin/cinnamon-session-cinnamon2d
sed "s|/usr/bin|$out/bin|g" -i ./files/usr/share/xsessions/cinnamon.desktop ./files/usr/share/xsessions/cinnamon2d.desktop

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"
)

# https://github.com/NixOS/nixpkgs/issues/129946
buildPythonPath "${python3.pkgs.xapp}"
patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
'';

passthru = {
Expand Down