summary refs log tree commit diff
path: root/pkgs/development/libraries/libwpd/default.nix
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-06 23:08:30 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-06 23:08:30 +0000
commit3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f (patch)
tree201cfcc1d18cbbb75bb90d244c7073b9a5899503 /pkgs/development/libraries/libwpd/default.nix
parent26ea77ad65d009fa6715934860ec769ee10a56b1 (diff)
parent1401241864c48ebab0f3b8c2df446e0c3ba4a720 (diff)
downloadnixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar
nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.gz
nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.bz2
nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.lz
nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.xz
nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.zst
nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.zip
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31386
Diffstat (limited to 'pkgs/development/libraries/libwpd/default.nix')
-rw-r--r--pkgs/development/libraries/libwpd/default.nix14
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index 78487a9f3237..dc3f8b5352de 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }:
+{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, xz }:
 
-stdenv.mkDerivation {
-  name = "libwpd-0.8.14";
+stdenv.mkDerivation rec {
+  name = "libwpd-0.9.4";
   
   src = fetchurl {
-    url = mirror://sourceforge/libwpd/libwpd-0.8.14.tar.gz;
-    sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
+    url = "mirror://sourceforge/libwpd/${name}.tar.xz";
+    sha256 = "0qba429cqd72nwn1mzpj7llyi3kwykb2lplcfxffvq8svzxyzkxy";
   };
   
-  buildInputs = [ pkgconfig glib libgsf libxml2 bzip2 ];
+  buildInputs = [ glib libgsf libxml2 ];
+
+  buildNativeInputs = [ pkgconfig xz ];
 }