public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Roll back OO.o version; subscribe to build results 

svn path=/nixpkgs/trunk/; revision=20964
This commit is contained in:
Michael Raskin 2010-04-06 21:46:52 +00:00
parent 3c2c4ac87a
commit f7880c95a3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/office/openoffice/builder.sh
View File

@ -10,6 +10,8 @@ postUnpack() {
} }
preConfigure() { preConfigure() {
./configure --help
for i in sysui/desktop/share/makefile.mk; do for i in sysui/desktop/share/makefile.mk; do
substituteInPlace $i --replace /bin/bash $shell substituteInPlace $i --replace /bin/bash $shell
done done

6
pkgs/applications/office/openoffice/default.nix
View File

@ -6,7 +6,7 @@
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2
}: }:
let version = "3.2.0"; in let version = "3.1.1"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openoffice.org-${version}"; name = "openoffice.org-${version}";
builder = ./builder.sh; builder = ./builder.sh;
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "b44ab94c75b89c9354531ddba9c211374567535e147308a934e8c35d7b26814a"; sha256 = "b44ab94c75b89c9354531ddba9c211374567535e147308a934e8c35d7b26814a";
}; };
patches = [ /* ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch */ ./root-required.patch ]; patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ];
src_system = fetchurl { src_system = fetchurl {
url = "${downloadRoot}/${version}/OOo_${version}_src_system.tar.bz2"; url = "${downloadRoot}/${version}/OOo_${version}_src_system.tar.bz2";
@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
--without-system-hunspell --without-system-hunspell
--without-system-altlinuxhyph --without-system-altlinuxhyph
--without-system-lpsolve --without-system-lpsolve
--without-system-graphite
"; ";
LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib"; LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
@ -77,5 +78,6 @@ stdenv.mkDerivation rec {
description = "OpenOffice.org is a multiplatform and multilingual office suite"; description = "OpenOffice.org is a multiplatform and multilingual office suite";
homepage = http://www.openoffice.org/; homepage = http://www.openoffice.org/;
license = "LGPL"; license = "LGPL";
maintainers = [ stdenv.lib.maintainers.raskin ];
}; };
} }