jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cinnamon.cinnamon-common: 5.8.4 -> 6.0.0

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

Removes libXfixes dependency.
3295a2d631

New hardcode absolute /usr/bin paths.
62b184e821

No longer need to patch scrollbar-test-widget.py.
9b9400cda3
This commit is contained in:
Bobby Rong 2023-11-19 23:00:11 +08:00
parent f9c72bdea4
commit 8d209118f5
No known key found for this signature in database
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View File

@ -9,7 +9,6 @@
, cjs
, evolution-data-server
, fetchFromGitHub
, fetchpatch
, gdk-pixbuf
, gettext
, libgnomekbd
@ -20,7 +19,6 @@
, intltool
, json-glib
, callPackage
, libsoup
, libstartup_notification
, libXtst
, libXdamage
@ -73,25 +71,18 @@ let
in
stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "5.8.4";
version = "6.0.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
hash = "sha256-34kOSDIU56cSZ4j0FadVfr9HLQytnK4ys88DFF7LTiM=";
hash = "sha256-kQvPdamS0t7YcWyCekdsLNXZfidaV3tdSptzHPGMSZ0=";
};
patches = [
./use-sane-install-dir.patch
./libdir.patch
# Backport pillow 10.0.0 support.
# https://github.com/linuxmint/cinnamon/issues/11746
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon/commit/fce9aad1ebb290802dc550e8dae6344dddf9dec1.patch";
hash = "sha256-flt7CblfXlLieAVNeC8TBnv1TX0Zca1obPWusBMnIxE=";
})
];
buildInputs = [
@ -108,7 +99,6 @@ stdenv.mkDerivation rec {
gsound
gtk3
json-glib
libsoup # referenced in js/ui/environment.js
libstartup_notification
libXtst
libXdamage
@ -170,9 +160,10 @@ stdenv.mkDerivation rec {
pushd ./files/usr/share/cinnamon/cinnamon-settings
substituteInPlace ./bin/capi.py --replace '"/usr/lib"' '"${cinnamon-control-center}/lib"'
substituteInPlace ./bin/CinnamonGtkSettings.py --replace "'python3'" "'${pythonEnv.interpreter}'"
substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds"
substituteInPlace ./bin/Spices.py --replace "msgfmt" "${gettext}/bin/msgfmt"
substituteInPlace ./bin/Spices.py --replace "subprocess.run(['/usr/bin/" "subprocess.run(['" \
--replace 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \
--replace "msgfmt" "${gettext}/bin/msgfmt"
substituteInPlace ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci"
substituteInPlace ./modules/cs_themes.py --replace "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d"
popd
@ -201,7 +192,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
providedSessions = [ "cinnamon" "cinnamon2d" ];
providedSessions = [ "cinnamon" "cinnamon2d" "cinnamon-wayland" ];
};
meta = with lib; {