From dc3f762019a038ae00b783bc9095a0486d7d1f31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Mar 2014 22:54:58 +0100
Subject: [PATCH] goffice: minor update, dep cleanup
Also enable parallel building.
---
pkgs/desktops/gnome-3/misc/goffice/default.nix | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/pkgs/desktops/gnome-3/misc/goffice/default.nix b/pkgs/desktops/gnome-3/misc/goffice/default.nix
index 51d259314a7a..0390fc133687 100644
--- a/pkgs/desktops/gnome-3/misc/goffice/default.nix
+++ b/pkgs/desktops/gnome-3/misc/goffice/default.nix
@@ -1,19 +1,23 @@
-{ fetchurl, stdenv, pkgconfig, intltool, bzip2, glib, gdk_pixbuf, gtk3
-, libgsf, libxml2, cairo, pango, librsvg, libspectre }:
+{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
+, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
stdenv.mkDerivation rec {
- name = "goffice-0.10.9";
+ name = "goffice-0.10.12";
src = fetchurl {
url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
- sha256 = "0xc82hymhkdglnksd3r7405p39d5ym826rwaa7dfkps5crjwq8cg";
+ sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff";
};
+ nativeBuildInputs = [ pkgconfig intltool ];
+
propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
- pkgconfig intltool bzip2 glib gdk_pixbuf gtk3
- libgsf libxml2 cairo pango librsvg libspectre
+ glib gtk3 libxml2 cairo pango libgsf
];
+ buildInputs = [ libxslt librsvg ];
+
+ enableParallelBuilding = true;
doCheck = true;
meta = {