From 7d97b7dcf545650d9e34073905dcdb5d4326f439 Mon Sep 17 00:00:00 2001 From: Naïm Favier Date: Sat, 22 Jan 2022 18:48:14 +0100 Subject: libhttpseverywhere: fix build with meson 0.60 Adds patch from https://gitlab.gnome.org/GNOME/libhttpseverywhere/-/merge_requests/1 --- pkgs/development/libraries/libhttpseverywhere/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/libhttpseverywhere') diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 975ad225813..80bc73e9a04 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -15,12 +15,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ]; buildInputs = [ glib libgee json-glib libsoup libarchive ]; - # Fixes build with vala >=0.42 patches = [ + # Fixes build with vala >=0.42 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch"; sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f"; }) + # fix build with meson 0.60 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/-/commit/4c38b2ca25802c464f3204a62815201d8cf549fd.patch"; + sha256 = "sha256-1+fmR0bpvJ9ISN2Hr+BTIQz+Bf6VfY1RdVZ/OohUlWU="; + }) ]; mesonFlags = [ "-Denable_valadoc=true" ]; -- cgit 1.4.1