diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 15:34:08 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 15:45:20 +0100 |
commit | a126ce011af5292f44c60f0a55423cec3917570c (patch) | |
tree | a95979b3006b167e90de09e6cb4bf5ca4206a2ca /pkgs/desktops | |
parent | 9bcacfb1429b2232ecffa40c86f13c0ede1d32ce (diff) | |
download | nixlib-a126ce011af5292f44c60f0a55423cec3917570c.tar nixlib-a126ce011af5292f44c60f0a55423cec3917570c.tar.gz nixlib-a126ce011af5292f44c60f0a55423cec3917570c.tar.bz2 nixlib-a126ce011af5292f44c60f0a55423cec3917570c.tar.lz nixlib-a126ce011af5292f44c60f0a55423cec3917570c.tar.xz nixlib-a126ce011af5292f44c60f0a55423cec3917570c.tar.zst nixlib-a126ce011af5292f44c60f0a55423cec3917570c.zip |
gnumeric: add schemas and icons, refactor
Also move goffice under gnome3, as it's released in the same way.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 21 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/misc/goffice/0.8.nix | 37 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/misc/goffice/default.nix | 33 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch | 13 |
4 files changed, 98 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index d3e575a7d278..d214a44aa0a4 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -1,14 +1,16 @@ -{ callPackage, lib, self, stdenv, gettext, overrides ? {}, pkgs }: +{ callPackage, self, pkgs }: rec { - inherit (pkgs) fetchurl_gnome glib gtk3 atk pango; - gtk = gtk3; + inherit (pkgs) glib gtk2 gtk3 gnome2; + gtk = gtk3; # just to be sure inherit (pkgs.gnome2) gnome_common ORBit2; orbit = ORBit2; - inherit (lib) lowPrio hiPrio appendToName makeOverridable; - __overrides = overrides; +#### Overrides of libraries + + librsvg = pkgs.librsvg.override { inherit gtk2; }; # gtk2 mysteriously needed in librsvg for goffice (commented in Gentoo) + #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) @@ -31,7 +33,7 @@ rec { gnome_terminal = callPackage ./core/gnome-terminal { }; - gsettings_desktop_schemas = lib.lowPrio (callPackage ./core/gsettings-desktop-schemas { }); + gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; }; @@ -43,16 +45,23 @@ rec { zenity = callPackage ./core/zenity { }; + #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) gnome_dictionary = callPackage ./desktop/gnome-dictionary { }; gnome_desktop = callPackage ./desktop/gnome-desktop { }; + # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; # scrollkeeper replacement rarian = callPackage ./desktop/rarian { }; + +#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ + + goffice = callPackage ./misc/goffice { }; + } diff --git a/pkgs/desktops/gnome-3/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/misc/goffice/0.8.nix new file mode 100644 index 000000000000..02520a9f121a --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/goffice/0.8.nix @@ -0,0 +1,37 @@ +{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 +, pango, libgsf, libxml2, libart, intltool, gettext +, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }: + +stdenv.mkDerivation rec { + name = "goffice-0.8.17"; + + src = fetchurl { + url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz"; + sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15"; + }; + + # fix linking error: undefined reference to pcre_info + patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986 + + buildInputs = [ + pkgconfig libglade bzip2 libart intltool gettext + gconf libgnomeui pcre + ]; + + propagatedBuildInputs = [ + # All these are in the "Requires:" field of `libgoffice-0.6.pc'. + glib libgsf libxml2 gtk libglade libart cairo pango + ]; + + postInstall = + '' + # Get GnuCash to build. Might be unnecessary if we upgrade pkgconfig. + substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires + ''; + + doCheck = true; + + meta = gnome3.goffice.meta // { + maintainers = [ ]; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/goffice/default.nix b/pkgs/desktops/gnome-3/misc/goffice/default.nix new file mode 100644 index 000000000000..d708ab92113a --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/goffice/default.nix @@ -0,0 +1,33 @@ +{ fetchurl, stdenv, pkgconfig, intltool, bzip2, glib, gdk_pixbuf, gtk3 +, libgsf, libxml2, cairo, pango, librsvg, libspectre }: + +stdenv.mkDerivation rec { + name = "goffice-0.10.9"; + + src = fetchurl { + url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; + sha256 = "0xc82hymhkdglnksd3r7405p39d5ym826rwaa7dfkps5crjwq8cg"; + }; + + propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection? + pkgconfig intltool bzip2 glib gdk_pixbuf gtk3 + libgsf libxml2 cairo pango librsvg libspectre + ]; + + doCheck = true; + + meta = { + description = "A Glib/GTK+ set of document centric objects and utilities"; + + longDescription = '' + There are common operations for document centric applications that are + conceptually simple, but complex to implement fully: plugins, load/save + documents, undo/redo. + ''; + + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.gnu; + }; + passthru = { inherit meta; }; +} diff --git a/pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch new file mode 100644 index 000000000000..cd4ef3c9fed7 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch @@ -0,0 +1,13 @@ +diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c +index bc4aae4..3adb696 100644 +--- a/goffice/utils/regutf8.c ++++ b/goffice/utils/regutf8.c +@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags) + default: return GO_REG_BADPAT; + } + } else { +- gor->re_nsub = pcre_info (r, NULL, NULL); ++ gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL); + gor->nosub = (cflags & GO_REG_NOSUB) != 0; + return 0; + } |