summary refs log tree commit diff
path: root/pkgs/development/libraries/libhttpseverywhere
diff options
context:
space:
mode:
authorsternenseemann <git@lukasepple.de>2016-10-24 17:13:16 +0200
committersternenseemann <git@lukasepple.de>2016-10-24 17:13:16 +0200
commit5feda977c834fff25a393dcc3c0c4355874acc2e (patch)
tree677e285c8794804beb5fd327017c2429c82c5e42 /pkgs/development/libraries/libhttpseverywhere
parent3d5630fac9c918ea66e230a779e3d968750a3cf1 (diff)
downloadnixpkgs-5feda977c834fff25a393dcc3c0c4355874acc2e.tar
nixpkgs-5feda977c834fff25a393dcc3c0c4355874acc2e.tar.gz
nixpkgs-5feda977c834fff25a393dcc3c0c4355874acc2e.tar.bz2
nixpkgs-5feda977c834fff25a393dcc3c0c4355874acc2e.tar.lz
nixpkgs-5feda977c834fff25a393dcc3c0c4355874acc2e.tar.xz
nixpkgs-5feda977c834fff25a393dcc3c0c4355874acc2e.tar.zst
nixpkgs-5feda977c834fff25a393dcc3c0c4355874acc2e.zip
libhttpseverywhere: 0.1.0 -> 0.2.0
Diffstat (limited to 'pkgs/development/libraries/libhttpseverywhere')
-rw-r--r--pkgs/development/libraries/libhttpseverywhere/default.nix10
-rw-r--r--pkgs/development/libraries/libhttpseverywhere/meson.patch13
2 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 27891fc4e4a..10ef8232ed8 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/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;
diff --git a/pkgs/development/libraries/libhttpseverywhere/meson.patch b/pkgs/development/libraries/libhttpseverywhere/meson.patch
deleted file mode 100644
index 3a86bf6b836..00000000000
--- a/pkgs/development/libraries/libhttpseverywhere/meson.patch
+++ /dev/null
@@ -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')
-