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

goffice_0_8: finally fix

Browse Source
This commit is contained in:
Vladimír Čunát 2013-02-23 19:16:42 +01:00
parent 80ccdf1a23
commit 06cd4df3b1
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
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

13
pkgs/development/libraries/goffice/pcre_info.patch Normal file
View File

@ -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;
}