diff options
| author | Samuel Leathers <sam@appliedtrust.com> | 2017-09-04 08:25:55 -0400 |
|---|---|---|
| committer | Samuel Leathers <sam@appliedtrust.com> | 2017-09-04 08:25:55 -0400 |
| commit | 4bfa7d891f6dc7f62a2213cc0dbc195e7f9f5cd9 (patch) | |
| tree | 8761026d51d19b2559daabc9dea84db4f11d24d5 /pkgs | |
| parent | e11c7399a00636e0abc02be7ad1026f0226ef3e5 (diff) | |
| download | nixlib-4bfa7d891f6dc7f62a2213cc0dbc195e7f9f5cd9.tar nixlib-4bfa7d891f6dc7f62a2213cc0dbc195e7f9f5cd9.tar.gz nixlib-4bfa7d891f6dc7f62a2213cc0dbc195e7f9f5cd9.tar.bz2 nixlib-4bfa7d891f6dc7f62a2213cc0dbc195e7f9f5cd9.tar.lz nixlib-4bfa7d891f6dc7f62a2213cc0dbc195e7f9f5cd9.tar.xz nixlib-4bfa7d891f6dc7f62a2213cc0dbc195e7f9f5cd9.tar.zst nixlib-4bfa7d891f6dc7f62a2213cc0dbc195e7f9f5cd9.zip | |
xiphos: 4.0.3 -> 4.0.6
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/xiphos/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index a9f786a2a084..ecd6ab8c2add 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3b2209e74de..9b50ce88cdc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |