mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
goffice_0_8: drop
This commit is contained in:
parent
370d08f0d2
commit
de6d70f52e
3 changed files with 0 additions and 57 deletions
|
@ -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 = [ ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -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;
|
|
||||||
}
|
|
|
@ -17324,12 +17324,6 @@ in
|
||||||
|
|
||||||
goffice = callPackage ../development/libraries/goffice { };
|
goffice = callPackage ../development/libraries/goffice { };
|
||||||
|
|
||||||
goffice_0_8 = callPackage ../development/libraries/goffice/0.8.nix {
|
|
||||||
inherit (pkgs.gnome2) libglade libgnomeui;
|
|
||||||
gconf = pkgs.gnome2.GConf;
|
|
||||||
libart = pkgs.gnome2.libart_lgpl;
|
|
||||||
};
|
|
||||||
|
|
||||||
jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
|
jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
|
||||||
jdk = jetbrains.jdk;
|
jdk = jetbrains.jdk;
|
||||||
}) // {
|
}) // {
|
||||||
|
|
Loading…
Reference in a new issue