From 6fe531299e8b2b8873501b0b2fffc15da9d8b60a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 15 Mar 2012 16:45:04 +0000 Subject: [PATCH] Avoiding the wrapper in libreoffice, and trying to use '-lcups'. svn path=/nixpkgs/trunk/; revision=33113 --- pkgs/applications/office/openoffice/libreoffice.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index 74824e2c30c..aa9c1712d55 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -5,7 +5,7 @@ , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa -, autoconf, automake, openldap, bash, makeWrapper +, autoconf, automake, openldap, bash , fontsConf , langs ? [ "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ] }: @@ -33,6 +33,12 @@ stdenv.mkDerivation rec { sha256 = "04hvlj6wzbj3zjpfjq975mgdmf902ywyf94nxcv067asg83qfcvr"; }; + # Openoffice will open libcups dynamically, so we link it directly + # to make its dlopen work. + NIX_LDFLAGS = "-lcups"; + + # If we call 'configure', 'make' will then call configure again without parameters. + # It's their system. configureScript = "./autogen.sh"; preConfigure = '' @@ -89,7 +95,6 @@ stdenv.mkDerivation rec { mkdir -p $out/bin for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a - wrapProgram $out/bin/$a --prefix LD_LIBRARY_PATH : ${cups}/lib done ''; @@ -147,7 +152,7 @@ stdenv.mkDerivation rec { libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack getopt file jdk cairo which icu boost libXext libX11 libXtst libXi mesa cups libXinerama openssl gperf GConf ORBit2 gnome_vfs gstreamer gst_plugins_base - ant autoconf openldap cppunit poppler librsvg automake makeWrapper + ant autoconf openldap cppunit poppler librsvg automake ]; meta = {