summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-08-08 15:52:55 +0800
committerBobby Rong <rjl931189261@126.com>2023-08-08 15:52:55 +0800
commitdeace553fa91bd359b1b571abd2bfdf8ab2d58a8 (patch)
tree10415dfb2c8067e96cb64fa6e87c2536008c33c1 /pkgs/desktops
parent5a8e9243812ba528000995b294292d3b5e120947 (diff)
downloadnixpkgs-deace553fa91bd359b1b571abd2bfdf8ab2d58a8.tar
nixpkgs-deace553fa91bd359b1b571abd2bfdf8ab2d58a8.tar.gz
nixpkgs-deace553fa91bd359b1b571abd2bfdf8ab2d58a8.tar.bz2
nixpkgs-deace553fa91bd359b1b571abd2bfdf8ab2d58a8.tar.lz
nixpkgs-deace553fa91bd359b1b571abd2bfdf8ab2d58a8.tar.xz
nixpkgs-deace553fa91bd359b1b571abd2bfdf8ab2d58a8.tar.zst
nixpkgs-deace553fa91bd359b1b571abd2bfdf8ab2d58a8.zip
cinnamon.cinnamon-common: Backport pillow 10.0.0 support
ref: https://github.com/NixOS/nixpkgs/commit/bdf1a96570808dc9e11cfbb1ffa5b8a7ff001e2d
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/cinnamon/cinnamon-common/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index 93888dd1179..3ff56b18d25 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -9,6 +9,7 @@
 , cjs
 , evolution-data-server
 , fetchFromGitHub
+, fetchpatch
 , gdk-pixbuf
 , gettext
 , libgnomekbd
@@ -84,6 +85,13 @@ stdenv.mkDerivation rec {
   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 = [