public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xiphos: 4.0.3 -> 4.0.6

Browse Source
This commit is contained in:
Samuel Leathers 2017-09-04 08:25:55 -04:00
parent e11c7399a0
commit 4bfa7d891f
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/misc/xiphos/default.nix
View File

@ -1,27 +1,29 @@
{stdenv, fetchurl, pkgconfig {stdenv, fetchFromGitHub, pkgconfig
, python , python
, intltool , intltool
, docbook2x, docbook_xml_dtd_412, libxslt , docbook2x, docbook_xml_dtd_412, libxslt
, sword, clucene_core, biblesync , sword, clucene_core, biblesync
, gnome_doc_utils , gnome_doc_utils
, libgsf, gconf , libgsf, gconf
, gtkhtml, libgtkhtml, libglade, scrollkeeper , gtkhtml, libglade, scrollkeeper
, webkitgtk , webkitgtk
, dbus_glib, enchant, isocodes, libuuid , dbus_glib, enchant, isocodes, libuuid, icu
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xiphos-${version}"; name = "xiphos-${version}";
version = "4.0.3-20150806"; version = "4.0.6";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz"; owner = "crosswire";
sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv"; repo = "xiphos";
rev = "${version}";
sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f";
}; };
buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt
sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libgtkhtml sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml
libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ]; libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ];
prePatch = '' prePatch = ''
patchShebangs .; patchShebangs .;
@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
''; '';
configurePhase = '' configurePhase = ''
python waf configure --prefix=$out python waf configure --prefix=$out --enable-webkit2
''; '';
buildPhase = '' buildPhase = ''

5
pkgs/top-level/all-packages.nix
View File

@ -17016,9 +17016,10 @@ with pkgs;
xiphos = callPackage ../applications/misc/xiphos { xiphos = callPackage ../applications/misc/xiphos {
gconf = gnome2.GConf; gconf = gnome2.GConf;
inherit (gnome2) gtkhtml libgtkhtml libglade scrollkeeper; inherit (gnome2) libglade scrollkeeper;
gtkhtml = gnome2.gtkhtml4;
webkitgtk = webkitgtk217x;
python = python27; python = python27;
webkitgtk = webkitgtk24x-gtk2;
}; };
xournal = callPackage ../applications/graphics/xournal { xournal = callPackage ../applications/graphics/xournal {