summary refs log tree commit diff
path: root/pkgs/development/libraries/librest
diff options
context:
space:
mode:
authorLorenz Brun <lorenz@brun.one>2023-01-09 00:21:04 +0100
committerLorenz Brun <lorenz@brun.one>2023-01-09 00:31:33 +0100
commitf35b1d038daafb2a71a6dd1c84437a41a03b7f38 (patch)
tree0aacc123e05d73fb21d1f98ec752132ca558f0b7 /pkgs/development/libraries/librest
parentefda2921993f5fa63dc2574ff6a60f01bb306b58 (diff)
downloadnixpkgs-f35b1d038daafb2a71a6dd1c84437a41a03b7f38.tar
nixpkgs-f35b1d038daafb2a71a6dd1c84437a41a03b7f38.tar.gz
nixpkgs-f35b1d038daafb2a71a6dd1c84437a41a03b7f38.tar.bz2
nixpkgs-f35b1d038daafb2a71a6dd1c84437a41a03b7f38.tar.lz
nixpkgs-f35b1d038daafb2a71a6dd1c84437a41a03b7f38.tar.xz
nixpkgs-f35b1d038daafb2a71a6dd1c84437a41a03b7f38.tar.zst
nixpkgs-f35b1d038daafb2a71a6dd1c84437a41a03b7f38.zip
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.
Diffstat (limited to 'pkgs/development/libraries/librest')
-rw-r--r--pkgs/development/libraries/librest/1.0.nix13
1 files changed, 13 insertions, 0 deletions
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