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

Let Libreoffice build its orcus on its own

This commit is contained in:
Michael Raskin 2015-04-05 09:18:31 +03:00
parent 07ba92e794
commit 5c5362427a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ let
("Error: update liborcus version inside LO expression") ("Error: update liborcus version inside LO expression")
(import ./libreoffice-srcs.nix)); (import ./libreoffice-srcs.nix));
buildInputs = [ boost mdds pkgconfig zlib libixion ]; buildInputs = [ boost mdds pkgconfig zlib /*libixion*/ ];
configureFlags = [ "--with-boost=${boost.dev}" ]; configureFlags = [ "--with-boost=${boost.dev}" ];
}; };
@ -235,6 +235,8 @@ stdenv.mkDerivation rec {
"--without-system-libpagemaker" "--without-system-libpagemaker"
"--without-system-coinmp" "--without-system-coinmp"
"--without-system-libgltf" "--without-system-libgltf"
"--without-system-orcus"
]; ];
checkPhase = '' checkPhase = ''
@ -253,10 +255,10 @@ stdenv.mkDerivation rec {
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
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 libixion mdds bluez5 glibc /*libixion*/
libxshmfence libatomic_ops graphite2 harfbuzz libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew librevenge libe-book libmwaw glm glew
liborcus libodfgen /*liborcus*/ libodfgen
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {