From 6327ba20896d69a35a619a241b0f89e463e53d60 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 21 Nov 2017 00:27:33 +0000 Subject: [PATCH] xiphos: 4.0.6 -> 4.0.7 --- pkgs/applications/misc/xiphos/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 54d61a047a78..a895c9b4537b 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -8,20 +8,21 @@ , gtkhtml, libglade, scrollkeeper , webkitgtk , dbus_glib, enchant, isocodes, libuuid, icu +, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "xiphos-${version}"; - version = "4.0.6"; + name = "xiphos-${version}"; + version = "4.0.7"; src = fetchFromGitHub { owner = "crosswire"; repo = "xiphos"; rev = "${version}"; - sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f"; + sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ]; @@ -34,11 +35,11 @@ stdenv.mkDerivation rec { export CLUCENE_HOME=${clucene_core}; export SWORD_HOME=${sword}; ''; - + configurePhase = '' python waf configure --prefix=$out --enable-webkit2 ''; - + buildPhase = '' python waf build ''; @@ -50,10 +51,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GTK Bible study tool"; longDescription = '' - Xiphos (formerly known as GnomeSword) is a Bible study tool - written for Linux, UNIX, and Windows using GTK, offering a rich - and featureful environment for reading, study, and research using - modules from The SWORD Project and elsewhere. + Xiphos (formerly known as GnomeSword) is a Bible study tool + written for Linux, UNIX, and Windows using GTK, offering a rich + and featureful environment for reading, study, and research using + modules from The SWORD Project and elsewhere. ''; homepage = http://www.xiphos.org/; license = licenses.gpl2Plus;