diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:15:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:18:23 +0000 |
| commit | b935ae5f3cfb2bb4f9a3746d284f156a6dece505 (patch) | |
| tree | 5efe4e2e7a7723a737d0130a333b057c5e76df40 /nixpkgs/pkgs/development/libraries/libhttpseverywhere | |
| parent | dc9566e91c9453378c24e98b5737234364670df5 (diff) | |
| parent | d26027792812fbfad4d0f451b5f47fdabf7fdeb9 (diff) | |
| download | nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.gz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.bz2 nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.lz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.xz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.zst nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.zip | |
Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libhttpseverywhere')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix b/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix index c1ec533ba5b8..cf5c80c9b219 100644 --- a/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala_0_40 -, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }: +{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch +, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection, valadoc }: let pname = "libhttpseverywhere"; @@ -12,10 +12,17 @@ in stdenv.mkDerivation rec { sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; }; - # Broken with newest Vala https://gitlab.gnome.org/GNOME/libhttpseverywhere/issues/1 - nativeBuildInputs = [ vala_0_40 gobject-introspection meson ninja pkgconfig ]; + nativeBuildInputs = [ vala gobject-introspection meson ninja pkgconfig ]; buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ]; + # Fixes build with vala >=0.42 + patches = [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch"; + sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f"; + }) + ]; + mesonFlags = [ "-Denable_valadoc=true" ]; doCheck = true; |