From 6b88ad4b16540478da92b75ba5549d4f21a11698 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Mon, 12 Mar 2012 20:15:08 +0000 Subject: I try to package libreoffice 3.5, as there was a weird segfault in 3.4, and they changed the build system in 3.5. It still does not build either... hopefully by more reachable troubles. svn path=/nixpkgs/trunk/; revision=33022 --- .../office/openoffice/generate-libreoffice-srcs.sh | 20 +- .../office/openoffice/libreoffice-srcs.nix | 356 +++++++++++++++++---- .../applications/office/openoffice/libreoffice.nix | 42 +-- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 316 insertions(+), 106 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh index 97bf2b32c9c..1d751ec7049 100644 --- a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh +++ b/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh @@ -1,25 +1,17 @@ -#!/bin/sh +#!/var/run/current-system/bin/bash -VERSIONBASE=3.4.5 - -VERSION=3.4.5.2 - -if [ $# -gt 2 ]; then - VERSIONBASE=$1 - VERSION=$2 -fi +# Take the list of files from the main package, ooo.lst.in echo '{fetchurl} : [' -for a in artwork base bootstrap calc components extensions extras filters \ - help impress libs-core libs-extern libs-extern-sys libs-gui postprocess \ - translations ure writer sdk testing; do +while read a; do - URL=http://download.documentfoundation.org/libreoffice/src/$VERSIONBASE/libreoffice-$a-$VERSION.tar.bz2 + URL=http://dev-www.libreoffice.org/src/$a + MD5=${a::32} echo '(fetchurl {' echo " url = \"$URL\";" - echo " sha256 = \"`nix-prefetch-url $URL`\";" + echo " md5 = \"$MD5\";" echo '})' done diff --git a/pkgs/applications/office/openoffice/libreoffice-srcs.nix b/pkgs/applications/office/openoffice/libreoffice-srcs.nix index 67ff5a67f95..7e84bfdbd71 100644 --- a/pkgs/applications/office/openoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/openoffice/libreoffice-srcs.nix @@ -1,154 +1,370 @@ {fetchurl} : [ (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-artwork-3.4.5.2.tar.bz2"; - sha256 = "01vi1njw0agpvxi0141k2arzhgq1kjbda7sj1l0l304qj9n78b1q"; + url = "http://dev-www.libreoffice.org/src/48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz"; + md5 = "48a9f787f43a09c0a9b7b00cd1fddbbf"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-base-3.4.5.2.tar.bz2"; - sha256 = "0f5rsyrn33iz0sny3wxsghv7c7yrbhas42yarb5rq958i3kpm6wz"; + url = "http://dev-www.libreoffice.org/src/63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz"; + md5 = "63ddc5116488985e820075e65fbe6aa4"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-calc-3.4.5.2.tar.bz2"; - sha256 = "1l00y0qj1s9m31jmqg7q7bczxa5xsng388nqc9zc3vd6zjf4xy9i"; + url = "http://dev-www.libreoffice.org/src/db5ffcd50064421176e8afb7b85fd1a7-pixman-0.24.0.tar.bz2"; + md5 = "db5ffcd50064421176e8afb7b85fd1a7"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-components-3.4.5.2.tar.bz2"; - sha256 = "1sq6yl06x006wxj1i89lv75sskb1bkxws82rcj1gvih6r8czih52"; + url = "http://dev-www.libreoffice.org/src/0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt"; + md5 = "0b49ede71c21c0599b0cc19b353a6cb3"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-extensions-3.4.5.2.tar.bz2"; - sha256 = "18xhk9h9vl9qhwlgv8ks3xi6hls2vgnkygnz1yhpf4p2g2y6nv7z"; + url = "http://dev-www.libreoffice.org/src/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2"; + md5 = "e1c178b18f130b40494561f02bc1a948"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-extras-3.4.5.2.tar.bz2"; - sha256 = "0zxm30na6hzpjfasi1g890magf63kmg39y6y56wz9hv2z9p5q8jv"; + url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + md5 = "17410483b5b5f267aa18b7e00b65e6e0"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-filters-3.4.5.2.tar.bz2"; - sha256 = "002qxqav39530csraq16ga4fnvw8v9wqbvp88b6lzi2m5yqpbl46"; + url = "http://dev-www.libreoffice.org/src/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"; + md5 = "1756c4fa6c616ae15973c104cd8cb256"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-help-3.4.5.2.tar.bz2"; - sha256 = "1agsqzz73dmsy2jsw63qq1ljx4h0ppz7zwqllc7617yiak0rqsqq"; + url = "http://dev-www.libreoffice.org/src/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz"; + md5 = "18f577b374d60b3c760a3a3350407632"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-impress-3.4.5.2.tar.bz2"; - sha256 = "0ivabx4wl7dkfalr0z4gqm5976phc6mkidnv1i580ixrf0zdz483"; + url = "http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"; + md5 = "1f24ab1d39f4a51faf22244c94a6203f"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-libs-core-3.4.5.2.tar.bz2"; - sha256 = "0blwd58hf51iixikrjrlqdm6n40wv5k2c9c8krfzxfcvk20mvv4b"; + url = "http://dev-www.libreoffice.org/src/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"; + md5 = "24be19595acad0a2cae931af77a0148a"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-libs-extern-3.4.5.2.tar.bz2"; - sha256 = "01cm3fjfj08a7b8i6iszml2ly1wa2hnkqqq1irvjb0wb1fjjxq3s"; + url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-libs-extern-sys-3.4.5.2.tar.bz2"; - sha256 = "1528n6mnlhpdhi9zfvqziwr6knsak212ghjww0jlfh31ky3whlh0"; + url = "http://dev-www.libreoffice.org/src/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz"; + md5 = "284e768eeda0e2898b0d5bf7e26a016e"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-libs-gui-3.4.5.2.tar.bz2"; - sha256 = "0win8si2yjkbfrwx46dw6as82iw7x4wd53cirncsrwvzksdqphcr"; + url = "http://dev-www.libreoffice.org/src/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"; + md5 = "2a177023f9ea8ec8bd00837605c5df1b"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-postprocess-3.4.5.2.tar.bz2"; - sha256 = "1rspqy1drfvj3rdfx8d7wbwn17vw08n26qmb98xwkgf5najdpfnp"; + url = "http://dev-www.libreoffice.org/src/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz"; + md5 = "2ae988b339daec234019a7066f96733e"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-translations-3.4.5.2.tar.bz2"; - sha256 = "0ngynrskq6h58gybswcpklj49cyvh0igksngbr0gz6n1yq3471iz"; + url = "http://dev-www.libreoffice.org/src/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz"; + md5 = "2c9b0f83ed5890af02c0df1c1776f39b"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-ure-3.4.5.2.tar.bz2"; - sha256 = "0wg06gbaq3ynqzaxaaqgxkjssxnggw6xqgfm63rmn9c1cd4q0mzy"; + url = "http://dev-www.libreoffice.org/src/0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz"; + md5 = "0be45d54cc5e1c2e3102e32b8c190346"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-writer-3.4.5.2.tar.bz2"; - sha256 = "0k7xf94abavdzpns1z13phl3vjz0xkfv2h5sn7rgpr3dy184klxh"; + url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + md5 = "35c94d2df8893241173de1d16b6034c0"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-sdk-3.4.5.2.tar.bz2"; - sha256 = "1f9iv875aw9sic4gl45ik1vx24gpq9iarjl673wz6l0wxr6hgrgw"; + url = "http://dev-www.libreoffice.org/src/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"; + md5 = "35efabc239af896dfb79be7ebdd6e6b9"; }) (fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-testing-3.4.5.2.tar.bz2"; - sha256 = "05sk3li5jgmjv722ncsr2i7arhmsvkkvmh4qw7xl70p8dpxhla8q"; + url = "http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + md5 = "39bb3fcea1514f1369fcfc87542390fd"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; - md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; + url = "http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"; - md5 = "ea91f2fb4212a21d708aced277e6e85a"; + url = "http://dev-www.libreoffice.org/src/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz"; + md5 = "3c219630e4302863a9a83d0efde889db"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz"; - md5 = "9ed97fce60a9a65852402248a6659492"; + url = "http://dev-www.libreoffice.org/src/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"; + md5 = "48470d662650c3c074e1c3fabbc67bbd"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; - md5 = "17410483b5b5f267aa18b7e00b65e6e0"; + url = "http://dev-www.libreoffice.org/src/48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz"; + md5 = "48d8169acc35f97e05d8dcdfd45be7f2"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2"; - md5 = "0ff7d225d087793c8c2c680d77aac3e7"; + url = "http://dev-www.libreoffice.org/src/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"; + md5 = "4a660ce8466c9df01f19036435425c3a"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz"; - md5 = "ea570af93c284aa9e5621cd563f54f4d"; + url = "http://dev-www.libreoffice.org/src/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"; + md5 = "f101a9e88b783337b20b2e26dfd26d5f"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"; - md5 = "ada24d37d8d638b3d8a9985e80bc2978"; + url = "http://dev-www.libreoffice.org/src/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz"; + md5 = "599dc4cc65a07ee868cf92a667a913d2"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz"; - md5 = "48a9f787f43a09c0a9b7b00cd1fddbbf"; + url = "http://dev-www.libreoffice.org/src/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz"; + md5 = "7740a8ec23878a2f50120e1faa2730f2"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz"; + md5 = "7376930b0d3f3d77a685d94c4a3acda8"; }) (fetchurl { url = "http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz"; - md5 = "3bf481ca95109b14435125c0dd1f2217"; + url = "http://dev-www.libreoffice.org/src/ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz"; + md5 = "ecb2e37e45c9933e2a963cabe03670ab"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz"; - md5 = "284e768eeda0e2898b0d5bf7e26a016e"; + url = "http://dev-www.libreoffice.org/src/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"; + md5 = "8294d6c42e3553229af9934c5c0ed997"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"; - md5 = "128cfc86ed5953e57fe0f5ae98b62c2e"; + url = "http://dev-www.libreoffice.org/src/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"; + md5 = "bd30e9cf5523cdfc019b94f5e1d7fd19"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz"; - md5 = "48d8169acc35f97e05d8dcdfd45be7f2"; + url = "http://dev-www.libreoffice.org/src/a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz"; + md5 = "a169ab152209200a7bad29a275cb0333"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html"; + md5 = "a4d9b30810a434a3ed39fc0003bbd637"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + md5 = "a7983f859eafb2677d7ff386a023bc40"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"; + md5 = "ada24d37d8d638b3d8a9985e80bc2978"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz"; + md5 = "af3c3acf618de6108d65fcdc92b492e1"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1"; + md5 = "bc702168a2af16869201dbe91e46ae48"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz"; + md5 = "c441926f3a552ed3e5b274b62e86af16"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz"; + md5 = "ca66e26082cab8bb817185a116db809b"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"; + md5 = "d4c4d91ab3a8e52a2e69d48d34ef4df4"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz"; + md5 = "d70951c80dabecc2892c919ff5d07172"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2"; - md5 = "5ba6a61a2f66dfd5fee8cdd4cd262a37"; + url = "http://dev-www.libreoffice.org/src/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt"; + md5 = "e0707ff896045731ff99e99799606441"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/83d4029aebf290c0a9a8fee9c99638d3-libwps-0.2.1.tar.bz2"; - md5 = "83d4029aebf290c0a9a8fee9c99638d3"; + url = "http://dev-www.libreoffice.org/src/e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2"; + md5 = "e81c2f0953aa60f8062c05a4673f2be0"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz"; + md5 = "e61d0364a30146aaa3001296f853b2b9"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz"; + md5 = "ea570af93c284aa9e5621cd563f54f4d"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"; + md5 = "ea91f2fb4212a21d708aced277e6e85a"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz"; + md5 = "ee8b492592568805593f81f8cdf2a04c"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt"; + md5 = "fb7ba5c2182be4e73748859967455455"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz"; + md5 = "fca8706f2c4619e2fa3f8f42f8fc1e9d"; }) (fetchurl { url = "http://dev-www.libreoffice.org/src/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"; md5 = "fdb27bfe2dbe2e7b57ae194d9bf36bab"; }) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip"; + md5 = "f872f4ac066433d8ff92f5e316b36ff9"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz"; + md5 = "0981bda6548a8c8233ffce2b6e4b2a23"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2"; + md5 = "061a9f17323117c9358ed60f33ecff78"; +}) (fetchurl { url = "http://dev-www.libreoffice.org/src/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz"; md5 = "067201ea8b126597670b5eff72e1f66c"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz"; - md5 = "fca8706f2c4619e2fa3f8f42f8fc1e9d"; + url = "http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; }) (fetchurl { - url = "http://dev-www.libreoffice.org/src/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz"; - md5 = "ca66e26082cab8bb817185a116db809b"; + url = "http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + md5 = "3bdf40c0d199af31923e900d082ca2dd"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + md5 = "8ce2fcd72becf06c41f7201d15373ed9"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + md5 = "97b2d4dba862397f446b217e2b623e71"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + md5 = "ace6ab49184e329db254e454a010f56d"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + md5 = "db60e4fde8dd6d6807523deb71ee34dc"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + md5 = "f94d9870737518e3b597f9265f4e9803"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + md5 = "ba2930200c9f019c2d93a8c88c651a0f"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz"; + md5 = "ff369e69ef0f0143beb5626164e87ae2"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz"; + md5 = "3dd55b952826d2b32f51308f2f91aa89"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz"; + md5 = "9f6e85e1e38490c3956f4415bcd33e6e"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz"; + md5 = "a7d6c5f2fe2d481149ed3ba807b5c043"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz"; + md5 = "3a84ac2da37cae5bf7ce616228c6fbde"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz"; + md5 = "22ad1c8d3fda7e73b0798035f3dd96bc"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz"; + md5 = "0611e099e807210cf738dcb41425d104"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz"; + md5 = "d7a242ca43e33e1b63d3073f9d46a6a8"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/220035f111ea045a51e290906025e8b5-libpng-1.5.1.tar.gz"; + md5 = "220035f111ea045a51e290906025e8b5"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz"; + md5 = "a2c10c04f396a9ce72894beb18b4e1f9"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz"; + md5 = "c735eab2d659a96e5a594c9e8541ad63"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz"; + md5 = "314e582264c36b3735466c522899aa07"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"; + md5 = "451ccf439a36a568653b024534669971"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/b99fb620b1324b4ce79ee6998b507146-JLanguageTool-1.4.0.tar.bz2"; + md5 = "b99fb620b1324b4ce79ee6998b507146"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz"; + md5 = "debc62758716a169df9f62e6ab2bc634"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"; + md5 = "0f63ee487fda8f21fafa767b3c447ac9"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz"; + md5 = "71474203939fafbe271e1263e61d083e"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2"; + md5 = "9d283e02441d8cebdcd1e5d9df227d67"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2"; + md5 = "c01351d7db2b205de755d58769288224"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/34dd7951abbda99b7a75a09993a37965-libwps-0.2.4.tar.bz2"; + md5 = "34dd7951abbda99b7a75a09993a37965"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2"; + md5 = "0ff7d225d087793c8c2c680d77aac3e7"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2"; + md5 = "f02578f5218f217a9f20e9c30e119c6a"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz"; + md5 = "3121aaf3e13e5d88dfff13fb4a5f1ab8"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz"; + md5 = "3bf481ca95109b14435125c0dd1f2217"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2"; + md5 = "776ad69a63ac1e99abed176e54ce25d9"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + md5 = "e7a384790b13c29113e22e596ade9687"; +}) +(fetchurl { + url = "http://dev-www.libreoffice.org/src/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz"; + md5 = "7c2549f6b0a8bb604e6c4c729ffdcfe6"; }) ] diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index d90beecd967..85c23316695 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -3,8 +3,9 @@ , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups -, libXinerama, openssl, gperf, cppunit, GConf, ORBit2 -, autoconf, openldap, postgresql, bash +, libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler +, librsvg, gnome_vfs, gstreamer, gstPluginsBase, mesa +, autoconf, automake, openldap, postgresql, bash , langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ] , force ? false }: @@ -14,23 +15,27 @@ if !force then Set config.libreoffice.force = true; if you want to try it anyway.'' else stdenv.mkDerivation rec { - name = "libreoffice-3.4.5.2"; + name = "libreoffice-3.5.0.3"; srcs_download = import ./libreoffice-srcs.nix { inherit fetchurl; }; src = fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-bootstrap-3.4.5.2.tar.bz2"; - sha256 = "05xz6ykddrm6mrgl9jssr2xpg2ir0x6c1c3n1cph0mvd0hiz58x9"; + url = "http://download.documentfoundation.org/libreoffice/src/3.5.0/libreoffice-core-3.5.0.3.tar.xz"; + sha256 = "04hvlj6wzbj3zjpfjq975mgdmf902ywyf94nxcv067asg83qfcvr"; }; + configureScript = "./autogen.sh"; + preConfigure = '' - sed -i 's,/usr/bin/env bash,${bash}/bin/bash,' Makefile.in bin/unpack-sources + sed -i 's,/usr/bin/env bash,${bash}/bin/bash,' bin/unpack-sources \ + solenv/bin/install-gdb-printers solenv/bin/striplanguagetags.sh # Needed to find genccode PATH=$PATH:${icu}/sbin ''; buildPhase = '' + mkdir src for a in $srcs_download; do FILE=$(basename $a) # take out the hash @@ -41,14 +46,8 @@ stdenv.mkDerivation rec { sed '/wget nor curl/{n;d}' -i download ./download - # Fix svtools: hardcoded jpeg path - sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,' solenv/inc/libs.mk # Fix sysui: wants to create a tar for root sed -i -e 's,--own.*root,,' sysui/desktop/slackware/makefile.mk - # Fix libtextcat: wants to set rpath to /usr/local/lib - sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, libtextcat/makefile.mk - # Fix hunspell: the checks fail due to /bin/bash missing, and I find this fix easier - sed -i -e 's,make && make check,make,' hunspell/makefile.mk # Fix redland: wants to set rpath to /usr/local/lib sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, redland/redland/makefile.mk \ redland/raptor/makefile.mk redland/rasqal/makefile.mk @@ -63,14 +62,11 @@ stdenv.mkDerivation rec { configureFlags = [ # Helpful, while testing the expression - # "--with-num-cpus=4" + "--with-num-cpus=4" "--enable-verbose" # Without these, configure does not finish - "--disable-gnome-vfs" - "--disable-gstreamer" - "--disable-opengl" "--without-junit" "--without-system-mythes" @@ -84,8 +80,6 @@ stdenv.mkDerivation rec { # I imagine this helps. Copied from go-oo. "--disable-epm" "--disable-fontooo" - "--disable-gnome-vfs" - "--disable-gnome-vfs" "--disable-mathmldtd" "--disable-mozilla" "--disable-odk" @@ -119,15 +113,21 @@ stdenv.mkDerivation rec { "--without-system-libwps" "--without-system-libwpg" "--without-system-redland" + "--without-system-libvisio" + "--without-system-libcmis" + "--without-system-nspr" + "--without-system-nss" + "--without-system-sampleicc" + "--without-system-libexttextcat" ]; buildInputs = [ pam python tcsh libxslt perl ArchiveZip CompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack - getopt file jdk cairo which icu boost libXext libX11 libXtst libXi - cups libXinerama openssl gperf GConf ORBit2 - ant autoconf openldap postgresql cppunit + getopt file jdk cairo which icu boost libXext libX11 libXtst libXi mesa + cups libXinerama openssl gperf GConf ORBit2 gnome_vfs gstreamer gstPluginsBase + ant autoconf openldap postgresql cppunit poppler librsvg automake ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89570dece01..dacbbe2b256 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6971,7 +6971,9 @@ let libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix { inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome) GConf ORBit2; + inherit (gnome) GConf ORBit2 gnome_vfs; + inherit (gst_all) gstreamer gstPluginsBase; + postgresql = postgresql91; force = getConfig [ "libreoffice" "force" ] false; }; -- cgit 1.4.1