From fbdd55d995bd578895839048752e01252718f095 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 10 Dec 2023 16:20:09 +0800 Subject: [PATCH] gnome.gnome-software: Backport AppStream 1.0 build fix --- pkgs/desktops/gnome/core/gnome-software/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index ac3e7c498137..f9994a0a7dbf 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , substituteAll , pkg-config , meson @@ -57,6 +58,17 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit isocodes; }) + + # Add support for AppStream 1.0. + # https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2393 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-software/-/commit/0655f358ed0e8455e12d9634f60bc4dbaee434e3.patch"; + hash = "sha256-8IXXUfNeha5yRlRLuxQV8whwQmyNw7Aoi/r5NNFS/zA="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-software/-/commit/e431ab003f3fabf616b6eb7dc93f8967bc9473e5.patch"; + hash = "sha256-Y5GcC1XMbb9Bl2/VKFnrV1B/ipLKxY4guse25LhxhKM="; + }) ]; nativeBuildInputs = [