libreoffice: 3.6.6.2 -> 4.0.5.2

This commit is contained in:
Domen Kožar 2013-09-01 01:57:33 +02:00
parent 793fa68806
commit ef8a149b6f
8 changed files with 186 additions and 388 deletions

View File

@ -1,4 +1,10 @@
{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip
# when updating version, wait for the build to fail
# run make without sourcing the environment and let libreoffice
# download all extra files
# then list extra files separated by newline and pipe them to
# generate-libreoffice-srcs.sh and copy output to libreoffice-srcs.nix
{ stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
@ -6,54 +12,89 @@
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus_glib, qt4, kde4, clucene_core, libcdr, lcms, vigra
, libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio
, fontsConf
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ]
, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, saneBackends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, langs ? [ "ALL" ]
}:
let
langsSpaces = stdenv.lib.concatStringsSep " " langs;
major = "3";
minor = "6";
patch = "6";
major = "4";
minor = "0";
patch = "5";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
# doesn't work with srcs versioning
libmspub = stdenv.mkDerivation rec {
version = "0.0.6";
name = "libmspub-${version}";
src = fetchurl {
url = "http://dev-www.libreoffice.org/src/${name}.tar.gz";
sha256 = "1zdcvnm0dpac5yqdv34hq9j38cnhyqzyjgb19iyp54ajnwfjhmcq";
};
configureFlags = "--disable-werror";
buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ];
};
# doesn't exist in srcs
libixion = stdenv.mkDerivation rec {
version = "0.5.0";
name = "libixion-${version}";
src = fetchurl {
url = "http://kohei.us/files/ixion/src/${name}.tar.bz2";
sha256 = "010k33bfkckx28r4rdk5mkd0mmayy5ng9ja0j0zg0z237gcfgrzb";
};
configureFlags = "--with-boost=${boost}";
buildInputs = [ boost mdds pkgconfig ];
};
fetchThirdParty = {name, md5}: fetchurl {
inherit name md5;
url = "http://dev-www.libreoffice.org/src/${md5}-${name}";
};
fetchSrc = {name, sha256}: fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
inherit sha256;
};
srcs = {
third_party = [ (fetchurl rec {
url = "http://dev-www.libreoffice.org/extern/${md5}-${name}";
md5 = "185d60944ea767075d27247c3162b3bc";
name = "unowinreg.dll";
}) ] ++ (map fetchThirdParty (import ./libreoffice-srcs.nix));
translations = fetchSrc {
name = "translations";
sha256 = "1n3yk2077adyxrhs0jpkbm8dg3lxpn3sy63f0dl87ifv7ha1rfpn";
sha256 = "0x96wlwr5m7w4k3ygydzak3ycq35hjq60vfi6nfxczlr8pfjyjxv";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
sha256 = "12rb5mw6sbi41w1zaxrj4qffiis9qcx8ibp5cpmwsz07nsdv5sxk";
sha256 = "0nab5jcgrrgn0v1yrm18nl9avp4vifbas48l1absz3jmzf9wka7b";
};
core = fetchSrc {
name = "core";
sha256 = "0xw36sa73cgk3k3fv1spv5pavm95bc02lszn8415ay36lcc098pn";
};
};
in
stdenv.mkDerivation rec {
name = "libreoffice-${version}";
src = srcs.core;
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "195g1iab7j2x7sl326xbq7vya412ns57xrwpv9hqdrb7iiz2n8la";
};
# Openoffice will open libcups dynamically, so we link it directly
# to make its dlopen work.
@ -69,31 +110,31 @@ stdenv.mkDerivation rec {
'' + (stdenv.lib.concatMapStrings (f: "ln -sv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\n") srcs.third_party)
+ ''
ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}
tar xf $sourceRoot/src/${srcs.help.name} -C $sourceRoot/../
ln -sv ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
tar xf $sourceRoot/src/${srcs.translations.name} -C $sourceRoot/../
'';
patchPhase = ''
find . -type f -print0 | xargs -0 sed -i \
-e 's,! */bin/bash,!${bash}/bin/bash,' -e 's,\(!\|SHELL=\) */usr/bin/env bash,\1${bash}/bin/bash,' \
-e 's,! */usr/bin/perl,!${perl}/bin/perl,' -e 's,! */usr/bin/env perl,!${perl}/bin/perl,' \
-e 's,! */usr/bin/python,!${python}/bin/python,' -e 's,! */usr/bin/env python,!${python}/bin/python,'
sed -i 's,ANT_OPTS+="\(.*\)",ANT_OPTS+=\1,' apache-commons/java/*/makefile.mk
-e 's,! */usr/bin/python,!${python3}/bin/python,' -e 's,! */usr/bin/env python,!${python3}/bin/python,'
#sed -i 's,ANT_OPTS+="\(.*\)",ANT_OPTS+=\1,' apache-commons/java/*/makefile.mk
'';
QT4DIR = qt4;
KDE4DIR = kde4.kdelibs;
# I set --with-num-cpus=$NIX_BUILD_CORES, as it's the equivalent of
# enableParallelBuilding=true in this build system.
preConfigure = ''
# Needed to find genccode
PATH=$PATH:${icu}/sbin
configureFlagsArray=("--with-lang=${langsSpaces}" "--with-num-cpus=$NIX_BUILD_CORES")
'';
makeFlags = "SHELL=${bash}/bin/bash";
enableParallelBuilding = true;
buildPhase = ''
# This is required as some cppunittests require fontconfig configured
export FONTCONFIG_FILE=${fontsConf}
@ -119,7 +160,10 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
#"--enable-verbose"
"--with-lang=${langsSpaces}"
"--with-vender=NixOS"
"--with-parallelism=1"
"--enable-verbose="
# Without these, configure does not finish
"--without-junit"
@ -131,16 +175,16 @@ stdenv.mkDerivation rec {
"--disable-odk"
"--with-system-cairo"
"--with-system-libs"
"--with-system-headers"
"--with-system-openssl"
"--with-system-openldap"
"--with-boost-libdir=${boost}/lib"
"--with-system-db"
"--with-openldap" "--enable-ldap"
"--without-system-libwps"
"--without-system-libwps" # TODO
"--without-doxygen"
# I imagine this helps. Copied from go-oo.
"--disable-epm"
"--disable-mathmldtd"
"--disable-mozilla"
"--disable-kde"
"--disable-postgresql-sdbc"
"--with-package-format=native"
@ -156,28 +200,33 @@ stdenv.mkDerivation rec {
"--without-system-altlinuxhyph"
"--without-system-lpsolve"
"--without-system-graphite"
"--without-system-mozilla-headers"
"--without-system-npapi-headers"
"--without-system-libcmis"
"--with-java-target-version=1.6" # The default 1.7 not supported
"--without-system-mozilla"
];
checkPhase = ''
make unitcheck
make slowcheck
'';
buildInputs =
[ ant ArchiveZip autoconf automake bison boost cairo clucene_core
CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig
freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk
hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat libiodbc libjpeg
hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes
neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
python sablotron saneBackends tcsh unzip vigra which zip zlib
python3 sablotron saneBackends tcsh unzip vigra which zip zlib libmspub
mdds liborcus bluez5 liblangtag glibc
];
meta = {
description = "Libre-office, variant of openoffice.org";
meta = with stdenv.lib; {
description = "LibreOffice is a comprehensive, professional-quality productivity suite, a variant of openoffice.org";
homepage = http://libreoffice.org/;
license = "LGPL";
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
license = licenses.lgpl3;
maintainers = [ maintainers.viric ];
platforms = platforms.linux;
};
}

View File

@ -1,4 +1,4 @@
#!/var/run/current-system/bin/bash
#!/run/current-system/sw/bin/bash
# Take the list of files from the main package, ooo.lst.in

View File

@ -1,374 +1,122 @@
[
{
name = "hyphen-2.8.3.tar.gz";
md5 = "86261f06c097d3e425a2f6d0b0635380";
name = "glibc-2.1.3-stub.tar.gz";
md5 = "4a660ce8466c9df01f19036435425c3a";
}
{
name = "openssl-0.9.8v.tar.gz";
md5 = "51a40a81b3b7abe8a5c33670bd3da0ce";
}
{
name = "pixman-0.24.4.tar.bz2";
md5 = "c63f411b3ad147db2bcce1bf262a0e02";
}
{
name = "README_apache-commons.txt";
md5 = "0b49ede71c21c0599b0cc19b353a6cb3";
}
{
name = "libexttextcat-3.3.1.tar.bz2";
md5 = "6097739c841f671cb21332b9cc593ae7";
}
{
name = "hsqldb_1_8_0.zip";
md5 = "17410483b5b5f267aa18b7e00b65e6e0";
}
{
name = "Adobe-Core35_AFMs-314.tar.gz";
md5 = "1756c4fa6c616ae15973c104cd8cb256";
}
{
name = "STLport-4.5.tar.gz";
md5 = "18f577b374d60b3c760a3a3350407632";
}
{
name = "xmlsec1-1.2.14.tar.gz";
md5 = "1f24ab1d39f4a51faf22244c94a6203f";
}
{
name = "LICENSE_source-9.0.0.7-bj.html";
md5 = "24be19595acad0a2cae931af77a0148a";
}
{
name = "lp_solve_5.5.tar.gz";
md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
}
{
name = "raptor-1.4.18.tar.gz";
md5 = "284e768eeda0e2898b0d5bf7e26a016e";
}
{
name = "jakarta-tomcat-5.0.30-src.tar.gz";
md5 = "2a177023f9ea8ec8bd00837605c5df1b";
}
{
name = "commons-lang-2.3-src.tar.gz";
md5 = "2ae988b339daec234019a7066f96733e";
}
{
name = "commons-httpclient-3.1-src.tar.gz";
md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
}
{
name = "liberation-fonts-ttf-1.07.1.tar.gz";
md5 = "0be45d54cc5e1c2e3102e32b8c190346";
}
{
name = "liberation-fonts-ttf-2.00.0.tar.gz";
md5 = "cfbf1ac6f61bf6cf45342a0cc9381be5";
}
{
name = "swingExSrc.zip";
md5 = "35c94d2df8893241173de1d16b6034c0";
}
{
name = "gentiumbasic-fonts-1.10.zip";
md5 = "35efabc239af896dfb79be7ebdd6e6b9";
}
{
name = "sacjava-1.3.zip";
md5 = "39bb3fcea1514f1369fcfc87542390fd";
}
{
name = "epm-3.7.tar.gz";
md5 = "3ade8cfe7e59ca8e65052644fed9fca4";
name = "ucpp-1.3.2.tar.gz";
md5 = "0168229624cfac409e766913506961a8";
}
{
name = "commons-logging-1.1.1-src.tar.gz";
md5 = "3c219630e4302863a9a83d0efde889db";
}
{
name = "README_source-9.0.0.7-bj.txt";
md5 = "48470d662650c3c074e1c3fabbc67bbd";
}
{
name = "clucene-core-2.3.3.4.tar.gz";
md5 = "48d647fbd8ef8889e5a7f422c1bfda94";
}
{
name = "glibc-2.1.3-stub.tar.gz";
md5 = "4a660ce8466c9df01f19036435425c3a";
}
{
name = "cairo-1.10.2.tar.gz";
md5 = "f101a9e88b783337b20b2e26dfd26d5f";
}
{
name = "xpdf-3.02.tar.gz";
md5 = "599dc4cc65a07ee868cf92a667a913d2";
}
{
name = "libxml2-2.7.6.tar.gz";
md5 = "7740a8ec23878a2f50120e1faa2730f2";
}
{
name = "STLport-4.5-0119.tar.gz";
md5 = "7376930b0d3f3d77a685d94c4a3acda8";
}
{
name = "rhino1_5R5.zip";
md5 = "798b2ffdc8bcfe7bca2cf92b62caf685";
}
{
name = "curl-7.19.7.tar.gz";
md5 = "ecb2e37e45c9933e2a963cabe03670ab";
}
{
name = "stax-api-1.0-2-sources.jar";
md5 = "8294d6c42e3553229af9934c5c0ed997";
}
{
name = "cppunit-1.12.1.tar.gz";
md5 = "bd30e9cf5523cdfc019b94f5e1d7fd19";
}
{
name = "seamonkey-1.1.14.source.tar.gz";
md5 = "a169ab152209200a7bad29a275cb0333";
}
{
name = "LICENSE_stax-api-1.0-2-sources.html";
md5 = "a4d9b30810a434a3ed39fc0003bbd637";
}
{
name = "xsltml_2.1.2.zip";
md5 = "a7983f859eafb2677d7ff386a023bc40";
}
{
name = "source-9.0.0.7-bj.zip";
md5 = "ada24d37d8d638b3d8a9985e80bc2978";
}
{
name = "commons-codec-1.3-src.tar.gz";
md5 = "af3c3acf618de6108d65fcdc92b492e1";
}
{
name = "LICENSE_Python-2.6.1";
md5 = "bc702168a2af16869201dbe91e46ae48";
}
{
name = "STLport-4.0.tar.gz";
md5 = "c441926f3a552ed3e5b274b62e86af16";
}
{
name = "redland-1.0.8.tar.gz";
md5 = "ca66e26082cab8bb817185a116db809b";
}
{
name = "core.zip";
md5 = "d4c4d91ab3a8e52a2e69d48d34ef4df4";
}
{
name = "db-4.7.25.NC-custom.tar.gz";
md5 = "d70951c80dabecc2892c919ff5d07172";
}
{
name = "README_db-4.7.25.NC-custom.txt";
md5 = "e0707ff896045731ff99e99799606441";
}
{
name = "Python-2.6.1.tar.bz2";
md5 = "e81c2f0953aa60f8062c05a4673f2be0";
}
{
name = "libxslt-1.1.26.tar.gz";
md5 = "e61d0364a30146aaa3001296f853b2b9";
}
{
name = "bsh-2.0b1-src.tar.gz";
md5 = "ea570af93c284aa9e5621cd563f54f4d";
}
{
name = "vigra1.4.0.tar.gz";
md5 = "ea91f2fb4212a21d708aced277e6e85a";
}
{
name = "expat-2.1.0.tar.gz";
md5 = "dd7dab7a5fea97d2a6a43f511449b7cd";
}
{
name = "README_stax-api-1.0-2-sources.txt";
md5 = "fb7ba5c2182be4e73748859967455455";
}
{
name = "rasqal-0.9.16.tar.gz";
md5 = "fca8706f2c4619e2fa3f8f42f8fc1e9d";
}
{
name = "dejavu-fonts-ttf-2.33.zip";
md5 = "f872f4ac066433d8ff92f5e316b36ff9";
}
{
name = "mysql-connector-c++-1.1.0.tar.gz";
md5 = "0981bda6548a8c8233ffce2b6e4b2a23";
}
{
name = "postgresql-9.1.1.tar.bz2";
md5 = "061a9f17323117c9358ed60f33ecff78";
}
{
name = "mythes-1.2.2.tar.gz";
md5 = "e1e255dc43dbcbb34cb19e8a0eba90ae";
}
{
name = "libformula-1.1.7.zip";
md5 = "3404ab6b1792ae5f16bbd603bd1e1d03";
}
{
name = "libfonts-1.1.6.zip";
md5 = "3bdf40c0d199af31923e900d082ca2dd";
}
{
name = "librepository-1.1.6.zip";
md5 = "8ce2fcd72becf06c41f7201d15373ed9";
}
{
name = "libloader-1.1.6.zip";
md5 = "97b2d4dba862397f446b217e2b623e71";
}
{
name = "libxml-1.1.7.zip";
md5 = "ace6ab49184e329db254e454a010f56d";
}
{
name = "flute-1.1.6.zip";
md5 = "d8bd5eed178db6e2b18eeed243f85aa8";
name = "liborcus_0.3.0.tar.bz2";
md5 = "8755aac23317494a9028569374dc87b2";
}
{
name = "liblayout-0.2.10.zip";
md5 = "db60e4fde8dd6d6807523deb71ee34dc";
}
{
name = "hsqldb_1_8_0.zip";
md5 = "17410483b5b5f267aa18b7e00b65e6e0";
}
{
name = "liblangtag-0.4.0.tar.bz2";
md5 = "54e578c91b1b68e69c72be22adcb2195";
}
{
name = "rhino1_5R5.zip";
md5 = "798b2ffdc8bcfe7bca2cf92b62caf685";
}
{
name = "bsh-2.0b1-src.tar.gz";
md5 = "ea570af93c284aa9e5621cd563f54f4d";
}
{
name = "xmlsec1-1.2.14.tar.gz";
md5 = "1f24ab1d39f4a51faf22244c94a6203f";
}
{
name = "librepository-1.1.6.zip";
md5 = "8ce2fcd72becf06c41f7201d15373ed9";
}
{
name = "libbase-1.1.6.zip";
md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624";
}
{
name = "lp_solve_5.5.tar.gz";
md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
}
{
name = "libloader-1.1.6.zip";
md5 = "97b2d4dba862397f446b217e2b623e71";
}
{
name = "graphite2-1.2.0.tgz";
md5 = "f5ef3f7f10fa8c3542c6a085a233080b";
}
{
name = "jakarta-tomcat-5.0.30-src.tar.gz";
md5 = "2a177023f9ea8ec8bd00837605c5df1b";
}
{
name = "hyphen-2.8.4.tar.gz";
md5 = "a2f6010987e1c601274ab5d63b72c944";
}
{
name = "libserializer-1.1.6.zip";
md5 = "f94d9870737518e3b597f9265f4e9803";
}
{
name = "commons-lang-2.3-src.tar.gz";
md5 = "2ae988b339daec234019a7066f96733e";
}
{
name = "libxml-1.1.7.zip";
md5 = "ace6ab49184e329db254e454a010f56d";
}
{
name = "commons-httpclient-3.1-src.tar.gz";
md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
}
{
name = "commons-codec-1.3-src.tar.gz";
md5 = "af3c3acf618de6108d65fcdc92b492e1";
}
{
name = "libformula-1.1.7.zip";
md5 = "3404ab6b1792ae5f16bbd603bd1e1d03";
}
{
name = "libcmis-0.3.0.tar.gz";
md5 = "b2371dc7cf4811c9d32146eec913d296";
}
{
name = "swingExSrc.zip";
md5 = "35c94d2df8893241173de1d16b6034c0";
}
{
name = "flow-engine-0.9.4.zip";
md5 = "ba2930200c9f019c2d93a8c88c651a0f";
}
{
name = "neon-0.29.5.tar.gz";
md5 = "ff369e69ef0f0143beb5626164e87ae2";
}
{
name = "gettext-0.18.1.1.tar.gz";
md5 = "3dd55b952826d2b32f51308f2f91aa89";
}
{
name = "glib-2.28.1.tar.gz";
md5 = "9f6e85e1e38490c3956f4415bcd33e6e";
}
{
name = "gdk-pixbuf-2.23.0.tar.gz";
md5 = "a7d6c5f2fe2d481149ed3ba807b5c043";
}
{
name = "libgsf-1.14.19.tar.gz";
md5 = "3a84ac2da37cae5bf7ce616228c6fbde";
}
{
name = "pango-1.28.3.tar.gz";
md5 = "22ad1c8d3fda7e73b0798035f3dd96bc";
}
{
name = "libcroco-0.6.2.tar.gz";
md5 = "0611e099e807210cf738dcb41425d104";
}
{
name = "librsvg-2.32.1.tar.gz";
md5 = "d7a242ca43e33e1b63d3073f9d46a6a8";
}
{
name = "libpng-1.5.10.tar.gz";
md5 = "9e5d864bce8f06751bbd99962ecf4aad";
}
{
name = "jpeg-8c.tar.gz";
md5 = "a2c10c04f396a9ce72894beb18b4e1f9";
}
{
name = "zlib-1.2.7.tar.bz2";
md5 = "2ab442d169156f34c379c968f3f482dd";
}
{
name = "icu4c-49_1_1-src.tgz";
md5 = "7c53f83e0327343f4060c0eb83842daf";
}
{
name = "ConvertTextToNumber-1.3.2.oxt";
md5 = "451ccf439a36a568653b024534669971";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
md5 = "b63e6340a02ff1cacfeadb2c42286161";
}
{
name = "ixion-0.2.0.tar.gz";
md5 = "0f63ee487fda8f21fafa767b3c447ac9";
}
{
name = "nss-3.13.5-with-nspr-4.9.1.tar.gz";
md5 = "a0a861f539f0e7a91d05e6b9457e4db1";
}
{
name = "libwpg-0.2.1.tar.bz2";
md5 = "9d283e02441d8cebdcd1e5d9df227d67";
}
{
name = "libwpd-0.9.4.tar.bz2";
md5 = "c01351d7db2b205de755d58769288224";
name = "sacjava-1.3.zip";
md5 = "39bb3fcea1514f1369fcfc87542390fd";
}
{
name = "libwps-0.2.7.tar.bz2";
md5 = "d197bd6211669a2fa4ca648faf04bcb1";
}
{
name = "mdds_0.6.1.tar.bz2";
md5 = "9f9e15966b5624834157fe3d748312bc";
name = "libfonts-1.1.6.zip";
md5 = "3bdf40c0d199af31923e900d082ca2dd";
}
{
name = "boost_1_44_0.tar.bz2";
md5 = "f02578f5218f217a9f20e9c30e119c6a";
}
{
name = "hunspell-1.3.2.tar.gz";
md5 = "3121aaf3e13e5d88dfff13fb4a5f1ab8";
}
{
name = "graphite2-1.0.3.tgz";
md5 = "3bf481ca95109b14435125c0dd1f2217";
}
{
name = "libvisio-0.0.19.tar.bz2";
md5 = "94e7f271e38c976462558b4278590178";
}
{
name = "LinLibertineG-20120116.zip";
md5 = "e7a384790b13c29113e22e596ade9687";
}
{
name = "libcmis-0.2.3.tar.gz";
md5 = "0d2dcdfbf28d6208751b33057f5361f0";
}
{
name = "libcdr-0.0.9.tar.bz2";
md5 = "3c0037fb07dea2f0bbae8386fa7c6a9a";
}
{
name = "lcms2-2.3.tar.gz";
md5 = "327348d67c979c88c2dec59a23a17d85";
name = "flute-1.1.6.zip";
md5 = "d8bd5eed178db6e2b18eeed243f85aa8";
}
]

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig }:
{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib }:
stdenv.mkDerivation rec {
name = "libvisio-0.0.19";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ boost libwpd libwpg ];
buildInputs = [ boost libwpd libwpg zlib ];
configureFlags = "--disable-werror";

View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2 }:
{ stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2 }:
stdenv.mkDerivation rec {
name = "libwpd-0.9.4";
name = "libwpd-0.9.5";
src = fetchurl {
url = "mirror://sourceforge/libwpd/${name}.tar.xz";
sha256 = "0qba429cqd72nwn1mzpj7llyi3kwykb2lplcfxffvq8svzxyzkxy";
sha256 = "1qvmnszql8c900py83wrxnj2pyyy4107scdhvmhapp4gpmccmg7f";
};
buildInputs = [ glib libgsf libxml2 ];
buildInputs = [ glib libgsf libxml2 zlib ];
nativeBuildInputs = [ pkgconfig ];
}

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libwpd }:
{ stdenv, fetchurl, pkgconfig, libwpd, zlib }:
stdenv.mkDerivation rec {
name = "libwpg-0.2.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0d83nx4rxkrq2sbfbbqpddni56h1328dzmraxyl6vh9p4f19rh5d";
};
buildInputs = [ libwpd ];
buildInputs = [ libwpd zlib ];
nativeBuildInputs = [ pkgconfig ];
meta = {

View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "mdds-0.6.0";
version = "0.7.1";
name = "mdds-${version}";
src = fetchurl {
url = http://multidimalgorithm.googlecode.com/files/mdds_0.6.0.tar.bz2;
sha256 = "0yx6cx2cxk9wpmfpv6k3agkr1sjzxdgxrm3zfj34zwyxr3sh0ql4";
url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2";
sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
};
meta = {

View File

@ -1,10 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "unixODBC-2.2.11";
stdenv.mkDerivation rec {
name = "unixODBC-2.3.1";
src = fetchurl {
url = mirror://sourceforge/unixodbc/unixODBC-2.2.11.tar.gz;
md5 = "9ae806396844e38244cf65ad26ba0f23";
url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz";
md5 = "86788d4006620fa1f171c13d07fdcaab";
};
configureFlags = "--disable-gui --sysconfdir=/etc";
}