diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-15 16:06:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-15 16:06:33 +0000 |
| commit | 4ac97e16b639560fa925d55575eb34efa9916047 (patch) | |
| tree | 96bbac83585ccc557a3bc572a4711c7dd06b3ef4 /pkgs/applications/office/openoffice/default.nix | |
| parent | 6ba53ec09a253b45757915e0f47fd6fd13f1e420 (diff) | |
| download | nixlib-4ac97e16b639560fa925d55575eb34efa9916047.tar nixlib-4ac97e16b639560fa925d55575eb34efa9916047.tar.gz nixlib-4ac97e16b639560fa925d55575eb34efa9916047.tar.bz2 nixlib-4ac97e16b639560fa925d55575eb34efa9916047.tar.lz nixlib-4ac97e16b639560fa925d55575eb34efa9916047.tar.xz nixlib-4ac97e16b639560fa925d55575eb34efa9916047.tar.zst nixlib-4ac97e16b639560fa925d55575eb34efa9916047.zip | |
* Fix an OpenOffice build problem (http://hydra.nixos.org/build/911291).
Not tested. svn path=/nixpkgs/branches/x-updates/; revision=25983
Diffstat (limited to 'pkgs/applications/office/openoffice/default.nix')
| -rw-r--r-- | pkgs/applications/office/openoffice/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 7c27bef0e451..5bc5cbf8c9b3 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -7,6 +7,7 @@ }: let version = "3.2.1"; in + stdenv.mkDerivation rec { name = "openoffice.org-${version}"; builder = ./builder.sh; @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i"; }; - patches = [ ./oo.patch ./root-required.patch ]; + patches = [ ./oo.patch ./root-required.patch ./xlib.patch ]; postPatch = /* Compiling with GCC 4.5 fails: |