JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libhttpseverywhere: build with latest vala

Browse Source
This commit is contained in:
worldofpeace 2019-03-17 22:00:47 -04:00
parent 81b5a5cf14
commit 1727324fae
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/libhttpseverywhere/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala_0_40 { stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch
, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }: , gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection, valadoc }:
let let
pname = "libhttpseverywhere"; pname = "libhttpseverywhere";
@ -12,10 +12,17 @@ in stdenv.mkDerivation rec {
sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
}; };
# Broken with newest Vala https://gitlab.gnome.org/GNOME/libhttpseverywhere/issues/1 nativeBuildInputs = [ vala gobject-introspection meson ninja pkgconfig ];
nativeBuildInputs = [ vala_0_40 gobject-introspection meson ninja pkgconfig ];
buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ]; 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" ]; mesonFlags = [ "-Denable_valadoc=true" ];
doCheck = true; doCheck = true;