From 0ef4e570c8ba7282234749d9684d27fb21f1f187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 10 Nov 2010 09:30:03 +0000 Subject: [PATCH] OpenOffice.org: Build with GCC 4.4. svn path=/nixpkgs/branches/stdenv-updates/; revision=24636 --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e62e7afbaa5..e400a55e9f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6084,6 +6084,12 @@ let openjump = callPackage ../applications/misc/openjump { }; openoffice = callPackage ../applications/office/openoffice { + /* OOo wants GCC 4.4 at most: + + ../../inc/uno/lbnames.h:70:2: error: #error "Supported gcc majors are 2 , 3 and 4 <= 4.4. Unsupported gcc major version." + dmake: Error code 1, while making '../../unxlngx6.pro/slo/AffineBridge.obj' + */ + stdenv = overrideGCC stdenv gcc44; inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2; neon = neon029;