diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-08-08 16:46:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-08 16:46:20 +0800 |
| commit | ff1834f0a3040f4c79892173131dc6428d4b4d2f (patch) | |
| tree | c68fbdef2e5f1af83e156c887adf2370645c9183 /pkgs/desktops | |
| parent | 9557dc5318883d6fc2e2ba4426c6fb4a6871eeee (diff) | |
| parent | deace553fa91bd359b1b571abd2bfdf8ab2d58a8 (diff) | |
| download | nixpkgs-ff1834f0a3040f4c79892173131dc6428d4b4d2f.tar nixpkgs-ff1834f0a3040f4c79892173131dc6428d4b4d2f.tar.gz nixpkgs-ff1834f0a3040f4c79892173131dc6428d4b4d2f.tar.bz2 nixpkgs-ff1834f0a3040f4c79892173131dc6428d4b4d2f.tar.lz nixpkgs-ff1834f0a3040f4c79892173131dc6428d4b4d2f.tar.xz nixpkgs-ff1834f0a3040f4c79892173131dc6428d4b4d2f.tar.zst nixpkgs-ff1834f0a3040f4c79892173131dc6428d4b4d2f.zip | |
Merge pull request #247886 from bobby285271/fix/cinnamon-background
cinnamon.cinnamon-common: Backport pillow 10.0.0 support
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 8 |
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 = [ |