BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

OpenOffice.org 3.2.1.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24644
This commit is contained in:
Ludovic Courtès 2010-11-10 16:22:29 +00:00
parent df2d680da8
commit 1410156f2a
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/office/openoffice/default.nix
View file

@ -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 = ''

6
pkgs/top-level/all-packages.nix
View file

@ -6084,12 +6084,6 @@ 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;