From 019c631840c00cd21686fad668c446dcaad55b49 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 29 Dec 2017 13:49:56 +0100 Subject: [PATCH] libhttpseverywhere: 0.4.5 -> 0.6.5 --- .../libraries/libhttpseverywhere/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 88a3ebbc4fb..c3405148242 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}: +{ stdenv, fetchurl, pkgconfig, meson, ninja, valadoc +, gnome3, glib, json_glib, libarchive, libsoup, gobjectIntrospection }: stdenv.mkDerivation rec { - major = "0.4"; + major = "0.6"; minor = "5"; version = "${major}.${minor}"; @@ -9,16 +10,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz"; - sha256 = "07sgcw285rl9wqr5k7srs3fj7fhgrrw6w780jx8wy8jw2bfwlvj2"; + sha256 = "0ksf6vqjyjii29dvy5147dmgqlqsq4d70xxai0p2prkx4jrwgj3z"; }; - nativeBuildInputs = [ gnome3.vala valadoc gobjectIntrospection meson ninja pkgconfig ]; - buildInputs = [ glib gnome3.libgee libxml2 json_glib libsoup libarchive ]; + nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig valadoc ]; + buildInputs = [ glib gnome3.libgee json_glib libsoup libarchive ]; + + mesonFlags = "-Denable_valadoc=true"; doCheck = true; checkPhase = "./httpseverywhere_test"; + outputs = [ "out" "devdoc" ]; + meta = { description = "library to use HTTPSEverywhere in desktop applications"; homepage = https://git.gnome.org/browse/libhttpseverywhere;