mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 21:21:06 +00:00
xiphos: 4.0.3 -> 4.0.6
This commit is contained in:
parent
e11c7399a0
commit
4bfa7d891f
|
@ -1,27 +1,29 @@
|
|||
{stdenv, fetchurl, pkgconfig
|
||||
{stdenv, fetchFromGitHub, pkgconfig
|
||||
, python
|
||||
, intltool
|
||||
, docbook2x, docbook_xml_dtd_412, libxslt
|
||||
, sword, clucene_core, biblesync
|
||||
, gnome_doc_utils
|
||||
, libgsf, gconf
|
||||
, gtkhtml, libgtkhtml, libglade, scrollkeeper
|
||||
, gtkhtml, libglade, scrollkeeper
|
||||
, webkitgtk
|
||||
, dbus_glib, enchant, isocodes, libuuid
|
||||
, dbus_glib, enchant, isocodes, libuuid, icu
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xiphos-${version}";
|
||||
version = "4.0.3-20150806";
|
||||
version = "4.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz";
|
||||
sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv";
|
||||
src = fetchFromGitHub {
|
||||
owner = "crosswire";
|
||||
repo = "xiphos";
|
||||
rev = "${version}";
|
||||
sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt
|
||||
sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libgtkhtml
|
||||
libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ];
|
||||
sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml
|
||||
libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs .;
|
||||
|
@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
configurePhase = ''
|
||||
python waf configure --prefix=$out
|
||||
python waf configure --prefix=$out --enable-webkit2
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
@ -17016,9 +17016,10 @@ with pkgs;
|
|||
|
||||
xiphos = callPackage ../applications/misc/xiphos {
|
||||
gconf = gnome2.GConf;
|
||||
inherit (gnome2) gtkhtml libgtkhtml libglade scrollkeeper;
|
||||
inherit (gnome2) libglade scrollkeeper;
|
||||
gtkhtml = gnome2.gtkhtml4;
|
||||
webkitgtk = webkitgtk217x;
|
||||
python = python27;
|
||||
webkitgtk = webkitgtk24x-gtk2;
|
||||
};
|
||||
|
||||
xournal = callPackage ../applications/graphics/xournal {
|
||||
|
|
Loading…
Reference in a new issue