diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-23 19:29:02 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-23 19:29:02 +0100 |
| commit | 0eeae100fd039067347f814dde29a351d13799e8 (patch) | |
| tree | fc0feed1035c902fbc83ec115aac1233bd4aa703 /pkgs | |
| parent | c173ddecbbfe6cb0677273467800d6483e735bce (diff) | |
| download | nixlib-0eeae100fd039067347f814dde29a351d13799e8.tar nixlib-0eeae100fd039067347f814dde29a351d13799e8.tar.gz nixlib-0eeae100fd039067347f814dde29a351d13799e8.tar.bz2 nixlib-0eeae100fd039067347f814dde29a351d13799e8.tar.lz nixlib-0eeae100fd039067347f814dde29a351d13799e8.tar.xz nixlib-0eeae100fd039067347f814dde29a351d13799e8.tar.zst nixlib-0eeae100fd039067347f814dde29a351d13799e8.zip | |
wv2: update and fix
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/wv2/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/tools/misc/wv2/fix-include.patch | 12 |
2 files changed, 27 insertions, 6 deletions
diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index 7a30d011be26..a3938c1af4c4 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -1,10 +1,19 @@ -{stdenv, fetchurl, pkgconfig, libgsf, glib, libxml2}: +{ stdenv, fetchurl, pkgconfig, cmake, libgsf, glib, libxml2 }: -stdenv.mkDerivation { - name = "wv2-0.3.1"; +stdenv.mkDerivation rec { + name = "wv2-0.4.2"; src = fetchurl { - url = mirror://sourceforge/wvware/wv2-0.3.1.tar.bz2; - sha256 = "896ff8ec59e280e8cb1ef9a953b364845dd65de1cdf8e4ed8a7e045a3f81c546"; + url = "mirror://sourceforge/wvware/${name}.tar.bz2"; + sha256 = "1p1qxr8z5bsiq8pvlina3c8c1vjcb5d96bs3zz4jj3nb20wnsawz"; + }; + + patches = [ ./fix-include.patch ]; + + buildInputs = [ pkgconfig cmake libgsf glib libxml2 ]; + + meta = { + description = "Excellent MS Word filter lib, used in most Office suites"; + license = "LGPLv2"; + homepage = http://wvware.sourceforge.net; }; - buildInputs = [ pkgconfig libgsf glib libxml2 ]; } diff --git a/pkgs/tools/misc/wv2/fix-include.patch b/pkgs/tools/misc/wv2/fix-include.patch new file mode 100644 index 000000000000..df34d24af942 --- /dev/null +++ b/pkgs/tools/misc/wv2/fix-include.patch @@ -0,0 +1,12 @@ +From: http://sourceforge.net/tracker/?func=detail&aid=3544851&group_id=10501&atid=110501 +--- a/src/olestream.h ++++ b/src/olestream.h +@@ -23,7 +23,7 @@ + #include "global.h" // U8,... typedefs + #include <stack> + +-#include <glib/giochannel.h> // GSeekType ++#include <glib.h> // GSeekType + + namespace wvWare { + |