Author: ludo
Date: Wed Nov 10 09:30:03 2010
New Revision: 24636
URL: https://svn.nixos.org/websvn/nix/?rev=24636&sc=1
Log:
OpenOffice.org: Build with GCC 4.4.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Wed Nov
10 09:16:48 2010 (r24635)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Wed Nov
10 09:30:03 2010 (r24636)
@@ -6084,6 +6084,12 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
