Merge pull request #19829 from sternenseemann/master

libhttpseverywhere: 0.1.0 -> 0.2.0

pkgs/development/libraries/libhttpseverywhere/default.nix

@@ -2,20 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "libhttpseverywhere-${version}";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "grindhold";
     repo  = "libhttpseverywhere";
     rev = "${version}";
-    sha256 = "1b8bcg4jp2h3nwk1g7jgswsipqzkjq2gb017v07wb7nvl6kdi0rc";
+    sha256 = "06yljz7xxh9v48awgmzma6avrnzs2kqh1ydd2hx4b1x2vgf8nfbb";
   };
 
   nativeBuildInputs = [ gnome3.vala valadoc  gobjectIntrospection meson ninja pkgconfig ];
   buildInputs = [ glib gnome3.libgee libxml2 json_glib libsoup libarchive ];
 
-  patches = [ ./meson.patch ];
-
   configurePhase = ''
     mkdir build
     cd build
@@ -29,6 +27,10 @@ stdenv.mkDerivation rec {
 
   installPhase = "ninja install";
 
+  doCheck = true;
+
+  checkPhase = "./httpseverywhere_test";
+
   meta = {
     description = "library to use HTTPSEverywhere in desktop applications";
     homepage    = https://github.com/grindhold/libhttpseverywhere;

pkgs/development/libraries/libhttpseverywhere/meson.patch

@@ -1,13 +0,0 @@
-diff --git a/meson.build b/meson.build
-index c20c2f9..f40bb2b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -19,7 +19,7 @@
- # If not, see http://www.gnu.org/licenses/.
- #*********************************************************************
- 
--project ('httpseverywhere', ['vala','c'])
-+project ('httpseverywhere', 'vala','c')
- 
- pkgconfig = import('pkgconfig')
-