cinnamon.cinnamon-common: 5.8.4 -> 6.0.0

https://github.com/linuxmint/cinnamon/compare/5.8.4...6.0.0

Removes libXfixes dependency.
https://github.com/linuxmint/cinnamon/commit/3295a2d631870416485fb53a4a28cea5366ff886

New hardcode absolute /usr/bin paths.
https://github.com/linuxmint/cinnamon/commit/62b184e8210bceb5ed0209d79d3d8dad599caf65

No longer need to patch scrollbar-test-widget.py.
https://github.com/linuxmint/cinnamon/commit/9b9400cda3a3034f825cb042bd031fb4bcdc8a9d

+6 -15
+6 -15
pkgs/desktops/cinnamon/cinnamon-common/default.nix
··· 9 9 , cjs 10 10 , evolution-data-server 11 11 , fetchFromGitHub 12 - , fetchpatch 13 12 , gdk-pixbuf 14 13 , gettext 15 14 , libgnomekbd ··· 20 19 , intltool 21 20 , json-glib 22 21 , callPackage 23 - , libsoup 24 22 , libstartup_notification 25 23 , libXtst 26 24 , libXdamage ··· 73 71 in 74 72 stdenv.mkDerivation rec { 75 73 pname = "cinnamon-common"; 76 - version = "5.8.4"; 74 + version = "6.0.0"; 77 75 78 76 src = fetchFromGitHub { 79 77 owner = "linuxmint"; 80 78 repo = "cinnamon"; 81 79 rev = version; 82 - hash = "sha256-34kOSDIU56cSZ4j0FadVfr9HLQytnK4ys88DFF7LTiM="; 80 + hash = "sha256-kQvPdamS0t7YcWyCekdsLNXZfidaV3tdSptzHPGMSZ0="; 83 81 }; 84 82 85 83 patches = [ 86 84 ./use-sane-install-dir.patch 87 85 ./libdir.patch 88 - 89 - # Backport pillow 10.0.0 support. 90 - # https://github.com/linuxmint/cinnamon/issues/11746 91 - (fetchpatch { 92 - url = "https://github.com/linuxmint/cinnamon/commit/fce9aad1ebb290802dc550e8dae6344dddf9dec1.patch"; 93 - hash = "sha256-flt7CblfXlLieAVNeC8TBnv1TX0Zca1obPWusBMnIxE="; 94 - }) 95 86 ]; 96 87 97 88 buildInputs = [ ··· 108 99 gsound 109 100 gtk3 110 101 json-glib 111 - libsoup # referenced in js/ui/environment.js 112 102 libstartup_notification 113 103 libXtst 114 104 libXdamage ··· 170 160 171 161 pushd ./files/usr/share/cinnamon/cinnamon-settings 172 162 substituteInPlace ./bin/capi.py --replace '"/usr/lib"' '"${cinnamon-control-center}/lib"' 173 - substituteInPlace ./bin/CinnamonGtkSettings.py --replace "'python3'" "'${pythonEnv.interpreter}'" 174 163 substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds" 175 - substituteInPlace ./bin/Spices.py --replace "msgfmt" "${gettext}/bin/msgfmt" 164 + substituteInPlace ./bin/Spices.py --replace "subprocess.run(['/usr/bin/" "subprocess.run(['" \ 165 + --replace 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \ 166 + --replace "msgfmt" "${gettext}/bin/msgfmt" 176 167 substituteInPlace ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci" 177 168 substituteInPlace ./modules/cs_themes.py --replace "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" 178 169 popd ··· 201 192 ''; 202 193 203 194 passthru = { 204 - providedSessions = [ "cinnamon" "cinnamon2d" ]; 195 + providedSessions = [ "cinnamon" "cinnamon2d" "cinnamon-wayland" ]; 205 196 }; 206 197 207 198 meta = with lib; {