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

libreoffice: more configure phase dependencies

Browse Source
This commit is contained in:
Domen Kožar 2013-09-01 12:30:17 +02:00
parent 7caf3daafa
commit 670be4c4bc
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/office/libreoffice/default.nix
View File

@ -26,6 +26,34 @@ let
tweak = "2"; tweak = "2";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
# configure phase dependency
liborcus = stdenv.mkDerivation rec {
version = "0.3.0";
name = "liborcus-${version}";
src = fetchurl {
url = "http://dev-www.libreoffice.org/src/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2";
sha256 = "0xrw13s390mcpm50apclydl38sw2sdq27csrr1k0d39jna2990ih";
};
configureFlags = "--disable-werror";
buildInputs = [ zlib boost mdds pkgconfig libixion libzip ];
};
# configure phase dependency
liblangtag = stdenv.mkDerivation rec {
version = "0.4.0";
name = "liblangtag-${version}";
src = fetchurl {
url = "http://dev-www.libreoffice.org/src/54e578c91b1b68e69c72be22adcb2195-${name}.tar.bz2";
sha256 = "1bjb0fxjmvzxlhr5by9wgisf6w5yvy6wgfzfkjyw6igk39fivdyb";
};
buildInputs = [ libtool pkgconfig libxml2 ];
};
# doesn't work with srcs versioning # doesn't work with srcs versioning
libmspub = stdenv.mkDerivation rec { libmspub = stdenv.mkDerivation rec {
@ -217,7 +245,7 @@ stdenv.mkDerivation rec {
libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes
neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
python3 sablotron saneBackends tcsh unzip vigra which zip zlib python3 sablotron saneBackends tcsh unzip vigra which zip zlib
mdds bluez5 glibc libmspub libixion mdds bluez5 glibc libmspub libixion liborcus liblangtag
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

8
pkgs/applications/office/libreoffice/libreoffice-srcs.nix
View File

@ -11,10 +11,6 @@
name = "commons-logging-1.1.1-src.tar.gz"; name = "commons-logging-1.1.1-src.tar.gz";
md5 = "3c219630e4302863a9a83d0efde889db"; md5 = "3c219630e4302863a9a83d0efde889db";
} }
{
name = "liborcus_0.3.0.tar.bz2";
md5 = "8755aac23317494a9028569374dc87b2";
}
{ {
name = "liblayout-0.2.10.zip"; name = "liblayout-0.2.10.zip";
md5 = "db60e4fde8dd6d6807523deb71ee34dc"; md5 = "db60e4fde8dd6d6807523deb71ee34dc";
@ -23,10 +19,6 @@
name = "hsqldb_1_8_0.zip"; name = "hsqldb_1_8_0.zip";
md5 = "17410483b5b5f267aa18b7e00b65e6e0"; md5 = "17410483b5b5f267aa18b7e00b65e6e0";
} }
{
name = "liblangtag-0.4.0.tar.bz2";
md5 = "54e578c91b1b68e69c72be22adcb2195";
}
{ {
name = "rhino1_5R5.zip"; name = "rhino1_5R5.zip";
md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; md5 = "798b2ffdc8bcfe7bca2cf92b62caf685";