diff options
author | Domen Kožar <domen@dev.si> | 2013-09-01 12:30:17 +0200 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2013-09-01 12:30:17 +0200 |
commit | 670be4c4bc52b6d203c6b9bd1a0c967292153600 (patch) | |
tree | 23d532260950d91830bac2858a380d4c5c7b7cda /pkgs | |
parent | 7caf3daafa4ce5257b4bc9a3251153a67a1ff29b (diff) |
libreoffice: more configure phase dependencies
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 30 | ||||
-rw-r--r-- | pkgs/applications/office/libreoffice/libreoffice-srcs.nix | 8 |
2 files changed, 29 insertions, 9 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index f147d69b8bceb..e1c9e2f0712ca 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -26,6 +26,34 @@ let tweak = "2"; subdir = "${major}.${minor}.${patch}"; 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 libmspub = stdenv.mkDerivation rec { @@ -217,7 +245,7 @@ stdenv.mkDerivation rec { libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler 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; { diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 8d8b46b6bd900..6ed1a5e2c639f 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -12,10 +12,6 @@ md5 = "3c219630e4302863a9a83d0efde889db"; } { - name = "liborcus_0.3.0.tar.bz2"; - md5 = "8755aac23317494a9028569374dc87b2"; -} -{ name = "liblayout-0.2.10.zip"; md5 = "db60e4fde8dd6d6807523deb71ee34dc"; } @@ -24,10 +20,6 @@ md5 = "17410483b5b5f267aa18b7e00b65e6e0"; } { - name = "liblangtag-0.4.0.tar.bz2"; - md5 = "54e578c91b1b68e69c72be22adcb2195"; -} -{ name = "rhino1_5R5.zip"; md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; } |