Since OOo 3.1.1 is broken anyway, this is my first attempt in supporting 3.2.0
svn path=/nixpkgs/trunk/; revision=20414
This commit is contained in:
parent
cb4a352b3e
commit
0894348d60
@ -6,23 +6,23 @@
|
|||||||
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2
|
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let version = "3.1.1"; in
|
let version = "3.2.0"; in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "openoffice.org-${version}";
|
name = "openoffice.org-${version}";
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=${version}";
|
url = "http://download.services.openoffice.org/files/stable/${version}/OOo_${version}_src_core.tar.bz2";
|
||||||
name = "OOo_${version}_src_core.tar.bz2";
|
name = "OOo_${version}_src_core.tar.bz2";
|
||||||
sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca";
|
sha256 = "0jl14rxmvhz86jlhhwqlbr9nfi9p271aknqxada9775qfm6bjjml";
|
||||||
};
|
};
|
||||||
|
|
||||||
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 = "http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=system&version=${version}";
|
url = "http://download.services.openoffice.org/files/stable/${version}/OOo_${version}_src_system.tar.bz2";
|
||||||
name = "OOo_${version}_src_system.tar.bz2";
|
name = "OOo_${version}_src_system.tar.bz2";
|
||||||
sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a";
|
sha256 = "0nihw4iyh9qc188dkyfjr3zvp6ym6i1spm16j0cyh5rgxcrn6ycp";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
|
Loading…
x
Reference in New Issue
Block a user