Skip to content

Commit

Permalink
cinnamon.cinnamon-common: 5.4.12 -> 5.6.1
Browse files Browse the repository at this point in the history
PR 11244 removed some of the hardcode paths:

- We now look for upload-system-info from PATH, but since we don't
"install" cinnamon.xapp, we still fix the path for it.
- We now look for cinnamon-control-center, gnome-control-center from
PATH. For the former, it is installed in the module and it cannot be
removed, so no need to fix the path. For the latter, it is not useful.
- cinnamon-launcher now looks for various fallback panels from PATH,
since they are optional so no need of fixing path.
- All *.desktop and *.service files are generated by Meson with correct
path now.

linuxmint/cinnamon@5.4.12...5.6.1
  • Loading branch information
bobby285271 committed Nov 18, 2022
1 parent 8d017d2 commit cdd7bd7
Showing 1 changed file with 5 additions and 13 deletions.
18 changes: 5 additions & 13 deletions pkgs/desktops/cinnamon/cinnamon-common/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@

stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "5.4.12";
version = "5.6.1";

src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
hash = "sha256-uyQZXri3V3dKnowB97QlPWboZz1neblyvCuSacsPROg=";
hash = "sha256-HKbAaSG9CQdAUvUM6XxCK5NN3aefmLiOu4zHkbxomaE=";
};

patches = [
Expand Down Expand Up @@ -136,7 +136,9 @@ stdenv.mkDerivation rec {
pkg-config
];

# use locales from cinnamon-translations (not using --localedir because datadir is used)
# Use locales from cinnamon-translations.
# FIXME: Upstream does not respect localedir option from Meson currently.
# https://github.com/linuxmint/cinnamon/pull/11244#issuecomment-1305855783
postInstall = ''
ln -s ${cinnamon-translations}/share/locale $out/share/locale
'';
Expand All @@ -149,26 +151,16 @@ 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|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
sed "s|\"upload-system-info\"|\"${xapp}/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
sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
# another bunch of optional stuff
sed "s|/usr/bin|/run/current-system/sw/bin|g" -i ./files/usr/bin/cinnamon-launcher
sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
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 ./files/usr/share/applications/cinnamon2d.desktop
sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py
Expand Down

0 comments on commit cdd7bd7

Please sign in to comment.