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

Merge #18013: gnumeric: 1.12.26 -> 1.12.32

Browse Source 
It seems fine on Linux, except for gtk3 theming problems but that looks
the same as before the update.
This commit is contained in:
Vladimír Čunát 2016-08-27 17:06:34 +02:00
commit 069120110d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +1,21 @@
{ stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
, goffice, gnome3, makeWrapper, gtk3 , goffice, gnome3, makeWrapper, gtk3, bison
, python, pygobject3 , python, pygobject3
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnumeric-1.12.26"; name = "gnumeric-1.12.32";
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 = "48250718133e998f7b2e73f71be970542e46c9096afb936dbcb152cf5394ee14"; sha256 = "a07bc83e2adaeb94bfa2c737c9a19d90381a19cb203dd7c4d5f7d6cfdbee6de8";
}; };
configureFlags = "--disable-component"; configureFlags = "--disable-component";
# ToDo: optional libgda, introspection? # ToDo: optional libgda, introspection?
buildInputs = [ buildInputs = [
pkgconfig intltool perl perlXMLParser pkgconfig intltool perl perlXMLParser bison
goffice gtk3 makeWrapper gnome3.defaultIconTheme goffice gtk3 makeWrapper gnome3.defaultIconTheme
python pygobject3 python pygobject3
]; ];
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
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" ${stdenv.lib.optionalString (!stdenv.isDarwin) "--prefix GIO_EXTRA_MODULES : '${gnome3.dconf}/lib/gio/modules'"}
done done
''; '';

4
pkgs/development/libraries/goffice/default.nix
View File

@ -2,11 +2,11 @@
, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "goffice-0.10.26"; name = "goffice-0.10.32";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
sha256 = "2b8dd0a0f84ef4f6bd32bfdae2b68caa0e41631026a74d04c4d2266512a744bb"; sha256 = "02b37da9f54fb92725b973875d1d2da49b54f6486eb03648fd1ea58e4a297ac3";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];