From ecbfab132896c26a59b71d7fc78fdeaa5b9b3667 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 20 Dec 2022 17:43:38 +0800 Subject: [PATCH 1/2] clutter-gst: Add patch from Arch Linux to fix corrupted display with Cheese The upstream project is archived. --- pkgs/development/libraries/clutter-gst/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 71e32e074c8f..e00cda47da6d 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf }: +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "clutter-gst"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy"; }; + patches = [ + # Add patch from Arch Linux to fix corrupted display with Cheese + # https://gitlab.gnome.org/GNOME/cheese/-/issues/51 + # https://github.com/archlinux/svntogit-packages/tree/packages/clutter-gst/trunk + (fetchpatch { + url = "https://github.com/archlinux/svntogit-packages/raw/c4dd0bbda35aa603ee790676f6e15541f71b6d36/trunk/0001-video-sink-Remove-RGBx-BGRx-support.patch"; + sha256 = "sha256-k1fCiM/u7q81UrDYgbqhN/C+q9DVQ+qOyq6vmA3hbSQ="; + }) + ]; + propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ]; nativeBuildInputs = [ pkg-config ]; From 766d49f1ec0ec51a6b3d483247818926dd7b946e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 20 Dec 2022 09:44:41 +0000 Subject: [PATCH 2/2] =?UTF-8?q?gnome.cheese:=2043.alpha=20=E2=86=92=2043.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/cheese/-/compare/43.alpha...43.0 The only non-translation change is "Remove glibc debug environment variables". --- pkgs/desktops/gnome/apps/cheese/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix index 4001e358e851..68d94abb33b6 100644 --- a/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "cheese"; - version = "43.alpha"; + version = "43.0"; outputs = [ "out" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "utrp972m+lch2regi4I3p15TJcDJpmlJj/VPdyFG5M8="; + sha256 = "dFdMSjwycyfxotbQs/k3vir7B6YVm21425wZLeZmfws="; }; nativeBuildInputs = [