diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-01-01 23:52:22 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-01-02 00:32:44 +0100 |
commit | de6d70f52e2acbc08d1e9db8c0f9af0a671d2137 (patch) | |
tree | 12db1bd3f632d269b40f654ada0992aac56040cb /pkgs/development | |
parent | 370d08f0d2b2a14bcde66e985888ec4150d7bb44 (diff) | |
download | nixpkgs-de6d70f52e2acbc08d1e9db8c0f9af0a671d2137.tar nixpkgs-de6d70f52e2acbc08d1e9db8c0f9af0a671d2137.tar.gz nixpkgs-de6d70f52e2acbc08d1e9db8c0f9af0a671d2137.tar.bz2 nixpkgs-de6d70f52e2acbc08d1e9db8c0f9af0a671d2137.tar.lz nixpkgs-de6d70f52e2acbc08d1e9db8c0f9af0a671d2137.tar.xz nixpkgs-de6d70f52e2acbc08d1e9db8c0f9af0a671d2137.tar.zst nixpkgs-de6d70f52e2acbc08d1e9db8c0f9af0a671d2137.zip |
goffice_0_8: drop
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/goffice/0.8.nix | 38 | ||||
-rw-r--r-- | pkgs/development/libraries/goffice/pcre_info.patch | 13 |
2 files changed, 0 insertions, 51 deletions
diff --git a/pkgs/development/libraries/goffice/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix deleted file mode 100644 index e050a615dd1..00000000000 --- a/pkgs/development/libraries/goffice/0.8.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk2, libglade, bzip2 -, pango, libgsf, libxml2, libart, intltool, gettext -, cairo, gconf, libgnomeui, pcre, goffice/*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 - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - libglade bzip2 libart intltool gettext - gconf libgnomeui pcre - ]; - - propagatedBuildInputs = [ - # All these are in the "Requires:" field of `libgoffice-0.6.pc'. - glib libgsf libxml2 gtk2 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 = goffice.meta // { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/goffice/pcre_info.patch b/pkgs/development/libraries/goffice/pcre_info.patch deleted file mode 100644 index cd4ef3c9fed..00000000000 --- a/pkgs/development/libraries/goffice/pcre_info.patch +++ /dev/null @@ -1,13 +0,0 @@ -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; - } |