diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-08-15 10:49:36 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-08-15 10:49:36 +0800 |
| commit | 8a19bf497c05b009d6040d3d0231baa4c27d57d3 (patch) | |
| tree | 83c9995cea7d604c000deb0b736a8c3131de0b4b /pkgs/desktops/cinnamon/cinnamon-common | |
| parent | c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d (diff) | |
| download | nixpkgs-8a19bf497c05b009d6040d3d0231baa4c27d57d3.tar nixpkgs-8a19bf497c05b009d6040d3d0231baa4c27d57d3.tar.gz nixpkgs-8a19bf497c05b009d6040d3d0231baa4c27d57d3.tar.bz2 nixpkgs-8a19bf497c05b009d6040d3d0231baa4c27d57d3.tar.lz nixpkgs-8a19bf497c05b009d6040d3d0231baa4c27d57d3.tar.xz nixpkgs-8a19bf497c05b009d6040d3d0231baa4c27d57d3.tar.zst nixpkgs-8a19bf497c05b009d6040d3d0231baa4c27d57d3.zip | |
cinnamon.cinnamon-common: 5.4.9 -> 5.4.10
Diffstat (limited to 'pkgs/desktops/cinnamon/cinnamon-common')
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 3581355387e..d1db0f8a25e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -9,6 +9,7 @@ , cjs , clutter , fetchFromGitHub +, fetchpatch , gdk-pixbuf , libgnomekbd , glib @@ -53,18 +54,31 @@ stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.4.9"; + version = "5.4.10"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-nM87NO/dwOd+hN5/3zX7XUjyKvXh4uDhLcGFcKE9ccA="; + hash = "sha256-yNjFP32+0LXqHfJUxm1A+CTuwny5/IxxT08689f7VlE="; }; patches = [ ./use-sane-install-dir.patch ./libdir.patch + # Re-add libsoup 2.4 as dependency - needed by some applets. + # Can be removed on next update. + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon/commit/76224fe409d074f8a44c70e4fd5e1289f92800b9.patch"; + sha256 = "sha256-nDt4kkK1kVstxbij63XxTJ2L/TM9Q1P6feok3xlPQOM="; + }) + # keybindings.js: Use bindings.get(). + # Can be removed on next update. + # https://github.com/linuxmint/cinnamon/issues/11055 + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon/commit/7724e4146baf8431bc1fb55dce60984e77adef5a.patch"; + sha256 = "sha256-idGtkBa13nmoEprtmAr6OssO16wJwBd16r2ZbbhrYDQ="; + }) ]; buildInputs = [ @@ -95,7 +109,7 @@ stdenv.mkDerivation rec { gsound gtk3 json-glib - libsoup + libsoup # referenced in js/ui/environment.js libstartup_notification libXtst libXdamage |