public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnumeric: fix build, minor update, enableParallelBuilding

This commit is contained in:
Vladimír Čunát 2015-05-24 19:52:57 +02:00
parent c75590fa6f
commit c505b8ac28
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/office/gnumeric/default.nix
View File

@ -3,15 +3,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnumeric-1.12.18"; name = "gnumeric-1.12.20";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; 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"; configureFlags = "--disable-component";
# ToDo: optional libgda, python, introspection? # ToDo: optional libgda, python, introspection?
@ -20,13 +18,14 @@ stdenv.mkDerivation rec {
gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme
]; ];
enableParallelBuilding = true;
preFixup = '' preFixup = ''
for f in "$out"/bin/gnumeric-*; do for f in "$out"/bin/gnumeric-*; do
wrapProgram $f \ wrapProgram $f \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
done done
rm $out/share/icons/hicolor/icon-theme.cache
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {