about summary refs log tree commit diff
path: root/pkgs/applications/office/openoffice/default.nix
diff options
context:
space:
mode:
authorSander van der Burg <s.vanderburg@tudelft.nl>2010-03-05 13:38:27 +0000
committerSander van der Burg <s.vanderburg@tudelft.nl>2010-03-05 13:38:27 +0000
commit0894348d60f9b9543663829d9395d3bedc81e316 (patch)
tree16344da34be316bd0d3e71cfe5b451360c740d1c /pkgs/applications/office/openoffice/default.nix
parentcb4a352b3eaeaa67e83929294d0e238a9d271782 (diff)
downloadnixlib-0894348d60f9b9543663829d9395d3bedc81e316.tar
nixlib-0894348d60f9b9543663829d9395d3bedc81e316.tar.gz
nixlib-0894348d60f9b9543663829d9395d3bedc81e316.tar.bz2
nixlib-0894348d60f9b9543663829d9395d3bedc81e316.tar.lz
nixlib-0894348d60f9b9543663829d9395d3bedc81e316.tar.xz
nixlib-0894348d60f9b9543663829d9395d3bedc81e316.tar.zst
nixlib-0894348d60f9b9543663829d9395d3bedc81e316.zip
Since OOo 3.1.1 is broken anyway, this is my first attempt in supporting 3.2.0
svn path=/nixpkgs/trunk/; revision=20414
Diffstat (limited to 'pkgs/applications/office/openoffice/default.nix')
-rw-r--r--pkgs/applications/office/openoffice/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index 5da79f8f4c4f..14e1191b31f6 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -6,23 +6,23 @@
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2
 }:
 
-let version = "3.1.1"; in
+let version = "3.2.0"; in
 stdenv.mkDerivation rec {
   name = "openoffice.org-${version}";
   builder = ./builder.sh;
 
   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";
-      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 {
-      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";
-      sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a";
+      sha256 = "0nihw4iyh9qc188dkyfjr3zvp6ym6i1spm16j0cyh5rgxcrn6ycp";
     };
 
   configureFlags = "