Author: ludo
Date: Wed Nov 10 16:22:29 2010
New Revision: 24644
URL: https://svn.nixos.org/websvn/nix/?rev=24644&sc=1
Log:
OpenOffice.org 3.2.1.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/office/openoffice/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/office/openoffice/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/office/openoffice/default.nix
Wed Nov 10 16:14:18 2010 (r24643)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/office/openoffice/default.nix
Wed Nov 10 16:22:29 2010 (r24644)
@@ -6,24 +6,24 @@
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2
}:
-let version = "3.2.0"; in
+let version = "3.2.1"; in
stdenv.mkDerivation rec {
name = "openoffice.org-${version}";
builder = ./builder.sh;
- downloadRoot = "http://download.services.openoffice.org/files/stable";;
+ downloadRoot = "http://openoffice.mirrorbrain.org/files/stable";;
versionDirs = true;
src = fetchurl {
url = "${downloadRoot}/${if versionDirs then version + "/" else
""}OOo_${version}_src_core.tar.bz2";
- sha256 = "0jl14rxmvhz86jlhhwqlbr9nfi9p271aknqxada9775qfm6bjjml";
+ sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i";
};
patches = [ ./oo.patch ./root-required.patch ];
src_system = fetchurl {
url = "${downloadRoot}/${if versionDirs then version + "/" else
""}OOo_${version}_src_system.tar.bz2";
- sha256 = "0nihw4iyh9qc188dkyfjr3zvp6ym6i1spm16j0cyh5rgxcrn6ycp";
+ sha256 = "0giy3sza64ij19w7b06rxcrkrb5kq2fvkz486vh3mv08s8xa8zfc";
};
preConfigure = ''
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Wed Nov
10 16:14:18 2010 (r24643)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Wed Nov
10 16:22:29 2010 (r24644)
@@ -6084,12 +6084,6 @@
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
