From 351d1d9032cc3c92281e65d2efa88a5a03ce78c6 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 7 Mar 2017 13:49:30 +0100
Subject: [PATCH] zimwriterfs: 20150710 -> 1.0

---
 pkgs/tools/text/zimwriterfs/default.nix | 35 ++++++++++++++++++-------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
index db604d862b88..6fcbf5061d1d 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -1,16 +1,33 @@
-{ stdenv, fetchgit, automake, autoconf, libtool, lzma, pkgconfig, zimlib, file, zlib }:
+{ stdenv
+, fetchFromGitHub
 
-stdenv.mkDerivation {
-  name = "zimwriterfs";
-  version = "20150710";
+, autoconf
+, automake
+, libtool
+, pkgconfig
 
-  src = fetchgit {
-    url = https://gerrit.wikimedia.org/r/p/openzim.git;
-    rev = "165eab3e154c60b5b6436d653dc7c90f56cf7456";
-    sha256 = "076ixsq4lis0rkk7p049g02bidc7bggl9kf2wzmgmsnx396mqymf";
+, file
+, icu
+, libgumbo
+, lzma
+, xapian
+, zimlib
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "zimwriterfs-${version}";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "wikimedia";
+    repo = "openzim";
+    rev = name;
+    sha256 = "1vkrrq929a8s3m5rri1lg0l2vd0mc9n2fsb2z1g88k4n4j2l6f19";
   };
 
-  buildInputs = [ automake autoconf libtool lzma pkgconfig zimlib file zlib ];
+  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
+  buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ];
   setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`";
   preConfigure = "./autogen.sh";