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

* Fix an OpenOffice build problem (http://hydra.nixos.org/build/911291). 

Not tested.

svn path=/nixpkgs/branches/x-updates/; revision=25983
This commit is contained in:
Eelco Dolstra 2011-02-15 16:06:33 +00:00
parent 6ba53ec09a
commit 4ac97e16b6
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/office/openoffice/default.nix
View File

@ -7,6 +7,7 @@
}: }:
let version = "3.2.1"; in let version = "3.2.1"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openoffice.org-${version}"; name = "openoffice.org-${version}";
builder = ./builder.sh; builder = ./builder.sh;
@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i"; sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i";
}; };
patches = [ ./oo.patch ./root-required.patch ]; patches = [ ./oo.patch ./root-required.patch ./xlib.patch ];
postPatch = postPatch =
/* Compiling with GCC 4.5 fails: /* Compiling with GCC 4.5 fails:

22
pkgs/applications/office/openoffice/xlib.patch Normal file
View File

@ -0,0 +1,22 @@
https://bugs.freedesktop.org/show_bug.cgi?id=31322
diff -rc OOO320_m19-orig//vcl/unx/inc/dtint.hxx OOO320_m19//vcl/unx/inc/dtint.hxx
*** OOO320_m19-orig//vcl/unx/inc/dtint.hxx 2010-05-26 20:34:28.000000000 +0200
--- OOO320_m19//vcl/unx/inc/dtint.hxx 2011-02-15 17:04:32.134813676 +0100
***************
*** 36,42 ****
class SalDisplay;
class AllSettings;
! #ifndef _XLIB_H_
// forwards from X
struct Display;
struct XEvent;
--- 36,42 ----
class SalDisplay;
class AllSettings;
! #if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
// forwards from X
struct Display;
struct XEvent;