From 5c5362427a3fa9aefccfca9e531492a8735d4e6f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Apr 2015 09:18:31 +0300 Subject: [PATCH] Let Libreoffice build its orcus on its own --- pkgs/applications/office/libreoffice/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 1e75d6cd3bc9..464b00167648 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -61,7 +61,7 @@ let ("Error: update liborcus version inside LO expression") (import ./libreoffice-srcs.nix)); - buildInputs = [ boost mdds pkgconfig zlib libixion ]; + buildInputs = [ boost mdds pkgconfig zlib /*libixion*/ ]; configureFlags = [ "--with-boost=${boost.dev}" ]; }; @@ -235,6 +235,8 @@ stdenv.mkDerivation rec { "--without-system-libpagemaker" "--without-system-coinmp" "--without-system-libgltf" + + "--without-system-orcus" ]; checkPhase = '' @@ -253,10 +255,10 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler python3 sablotron saneBackends tcsh unzip vigra which zip zlib - mdds bluez5 glibc libixion + mdds bluez5 glibc /*libixion*/ libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew - liborcus libodfgen + /*liborcus*/ libodfgen ]; meta = with stdenv.lib; {