diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-11-19 23:00:11 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2023-11-28 20:28:47 +0800 |
| commit | 9f847ddb5b1295de5cfe4d769a8a30be1793d4f3 (patch) | |
| tree | 9db19b74c0400412dc679fb682b67253e1aeb66f | |
| parent | cinnamon.mint-l-theme: 1.9.5 -> 1.9.6 (diff) | |
| download | nixpkgs-9f847ddb5b1295de5cfe4d769a8a30be1793d4f3.tar.gz | |
cinnamon.cinnamon-common: 5.8.4 -> unstable-2023-11-19
https://github.com/linuxmint/cinnamon/compare/5.8.4...fc69a484f56a07386fe07f3b1c05c5ded1bb126b
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 3ff56b18d255..4a284f54754c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -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 = "unstable-2023-11-19"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; - rev = version; - hash = "sha256-34kOSDIU56cSZ4j0FadVfr9HLQytnK4ys88DFF7LTiM="; + rev = "fc69a484f56a07386fe07f3b1c05c5ded1bb126b"; + hash = "sha256-OzZpkYOmrp8yWZsOjltQLXD6ZAExLx3zwOqPSkDNdng="; }; 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,7 +160,6 @@ 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 ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci" @@ -201,7 +190,7 @@ stdenv.mkDerivation rec { ''; passthru = { - providedSessions = [ "cinnamon" "cinnamon2d" ]; + providedSessions = [ "cinnamon" "cinnamon2d" "cinnamon-wayland" ]; }; meta = with lib; { |