From 150172424d0f945700b3bae5d87aa9a9e6357b12 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 8 Aug 2023 14:22:12 +0800 Subject: [PATCH 1/2] cinnamon.pix: Fix build with exiv2 0.28 --- pkgs/desktops/cinnamon/pix/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index 10e6c4e96bf2..ef434171d914 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -1,7 +1,7 @@ { stdenv , lib -, fetchurl , fetchFromGitHub +, fetchpatch , pkg-config , meson , ninja @@ -43,6 +43,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-iNUhcHG4nCZ4WNELodyLdztzfNg9g+F0eQrZHXS6Zj0="; }; + patches = [ + # Fix build with exiv2 0.28, can be removed on next update + # https://github.com/linuxmint/pix/pull/178 + (fetchpatch { + url = "https://github.com/linuxmint/pix/commit/46e19703a973d51fa97e6a22121560f5ba200eea.patch"; + sha256 = "sha256-Z+pUxoy0m/agXW++YxEUhRuax0qvuGVXNhU8d9mvGh4="; + }) + ]; + nativeBuildInputs = [ bison desktop-file-utils From e7f74b92dd181c90622d130c83f8dbea4bdc3896 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 8 Aug 2023 14:34:41 +0800 Subject: [PATCH 2/2] gthumb: Fix build with exiv2 0.28 --- pkgs/applications/graphics/gthumb/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index ecb09e539b3e..603d14b31dcf 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -49,6 +49,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch"; sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ="; }) + + # Fix build with exiv2 0.28, can be removed on next update + # https://gitlab.gnome.org/GNOME/gthumb/-/issues/282 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/3376550ae109286de09ce5f89e05060eb80230a7.patch"; + sha256 = "sha256-zHX+kV7RaHXFqbR15RTaRcZJPU/P3uUj03tFUv0DR5o="; + }) ]; nativeBuildInputs = [