about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-12-10 16:20:09 +0800
committerBobby Rong <rjl931189261@126.com>2024-01-04 22:28:07 +0800
commitfbdd55d995bd578895839048752e01252718f095 (patch)
tree5a72964b7aee2c19b0cd783344bb46310e86e9e1 /pkgs/desktops
parent0426692aa2803d3bf865144cf71fc4fa65a48229 (diff)
downloadnixlib-fbdd55d995bd578895839048752e01252718f095.tar
nixlib-fbdd55d995bd578895839048752e01252718f095.tar.gz
nixlib-fbdd55d995bd578895839048752e01252718f095.tar.bz2
nixlib-fbdd55d995bd578895839048752e01252718f095.tar.lz
nixlib-fbdd55d995bd578895839048752e01252718f095.tar.xz
nixlib-fbdd55d995bd578895839048752e01252718f095.tar.zst
nixlib-fbdd55d995bd578895839048752e01252718f095.zip
gnome.gnome-software: Backport AppStream 1.0 build fix
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome/core/gnome-software/default.nix12
1 files changed, 12 insertions, 0 deletions
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 = [