From c505b8ac287aac0d5fecfc3b8e91f5cdc22ed649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 24 May 2015 19:52:57 +0200 Subject: [PATCH] gnumeric: fix build, minor update, enableParallelBuilding --- pkgs/applications/office/gnumeric/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 14e130ba1ff..02a78a2b2d1 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -3,15 +3,13 @@ }: stdenv.mkDerivation rec { - name = "gnumeric-1.12.18"; + name = "gnumeric-1.12.20"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "402224f858cfa4e91503ab1be0491fa3322713dabe56b6eae171def8b736d9e9"; + sha256 = "1k915ks55a32fpqrr0rx6j8ml9bw0a07f11350qc1bvkx53i2jad"; }; - preConfigure = ''sed -i 's/\(SUBDIRS.*\) doc/\1/' Makefile.in''; # fails when installing docs - configureFlags = "--disable-component"; # ToDo: optional libgda, python, introspection? @@ -20,13 +18,14 @@ stdenv.mkDerivation rec { gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme ]; + enableParallelBuilding = true; + preFixup = '' for f in "$out"/bin/gnumeric-*; do wrapProgram $f \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" done - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; {