From f35b1d038daafb2a71a6dd1c84437a41a03b7f38 Mon Sep 17 00:00:00 2001
From: Lorenz Brun <lorenz@brun.one>
Date: Mon, 9 Jan 2023 00:21:04 +0100
Subject: librest_1_0: pick up crash fix with libsoup 3

During librest's migration to libsoup 3 a bug was introduced which
causes the following assertion failure and subsequent abort when a
librest request could not be completed due to a network failure:

  Rest:ERROR:../rest/rest-proxy-call.c:628:finish_call: assertion failed: (payload)

This picks up a merge request which contains the fix.
---
 pkgs/development/libraries/librest/1.0.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'pkgs/development/libraries/librest')

diff --git a/pkgs/development/libraries/librest/1.0.nix b/pkgs/development/libraries/librest/1.0.nix
index 130d6944e92..fec622752f8 100644
--- a/pkgs/development/libraries/librest/1.0.nix
+++ b/pkgs/development/libraries/librest/1.0.nix
@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, fetchpatch
 , fetchurl
 , meson
 , ninja
@@ -24,6 +25,18 @@ stdenv.mkDerivation rec {
     sha256 = "kmalwQ7OOD4ZPft/+we1CcwfUVIauNrXavlu0UISwuM=";
   };
 
+  patches = [
+    # Pick up MR 30 (https://gitlab.gnome.org/GNOME/librest/-/merge_requests/30) to fix GOA crashes with libsoup 3
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/librest/-/commit/fbad64abe28a96f591a30e3a5d3189c10172a414.patch";
+      hash = "sha256-r8+h84Y/AdM1IOMRcBVwDvfqapqOY8ZtRXdOIQvFR9w=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/librest/-/commit/8049048a0f7d52b3f4101c7123797fed099d4cc8.patch";
+      hash = "sha256-AMhHKzzOoTIlkRwN4KfUwdhxlqvtRgiVjKRfnG7KZwc=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
-- 
cgit 1.4.1