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