diff options
author | Naïm Favier <n@monade.li> | 2022-01-22 18:48:14 +0100 |
---|---|---|
committer | Naïm Favier <n@monade.li> | 2022-01-22 20:28:13 +0100 |
commit | 7d97b7dcf545650d9e34073905dcdb5d4326f439 (patch) | |
tree | 99ae43dca4843f42557ca8e3ecf9f3fcb5aa4a31 /pkgs/development/libraries/libhttpseverywhere | |
parent | 9ab8b1400c5ac6cb2d0ed0bc7787cdecc86a6903 (diff) | |
download | nixpkgs-7d97b7dcf545650d9e34073905dcdb5d4326f439.tar nixpkgs-7d97b7dcf545650d9e34073905dcdb5d4326f439.tar.gz nixpkgs-7d97b7dcf545650d9e34073905dcdb5d4326f439.tar.bz2 nixpkgs-7d97b7dcf545650d9e34073905dcdb5d4326f439.tar.lz nixpkgs-7d97b7dcf545650d9e34073905dcdb5d4326f439.tar.xz nixpkgs-7d97b7dcf545650d9e34073905dcdb5d4326f439.tar.zst nixpkgs-7d97b7dcf545650d9e34073905dcdb5d4326f439.zip |
libhttpseverywhere: fix build with meson 0.60
Adds patch from https://gitlab.gnome.org/GNOME/libhttpseverywhere/-/merge_requests/1
Diffstat (limited to 'pkgs/development/libraries/libhttpseverywhere')
-rw-r--r-- | pkgs/development/libraries/libhttpseverywhere/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
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" ]; |