Avoiding the wrapper in libreoffice, and trying to use '-lcups'.

svn path=/nixpkgs/trunk/; revision=33113
This commit is contained in:
Lluís Batlle i Rossell 2012-03-15 16:45:04 +00:00
parent 3337fa7b87
commit 6fe531299e

View file

@ -5,7 +5,7 @@
, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
, autoconf, automake, openldap, bash, makeWrapper , autoconf, automake, openldap, bash
, fontsConf , fontsConf
, langs ? [ "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ] , langs ? [ "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
}: }:
@ -33,6 +33,12 @@ stdenv.mkDerivation rec {
sha256 = "04hvlj6wzbj3zjpfjq975mgdmf902ywyf94nxcv067asg83qfcvr"; 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"; configureScript = "./autogen.sh";
preConfigure = '' preConfigure = ''
@ -89,7 +95,6 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a ln -s $out/lib/libreoffice/program/$a $out/bin/$a
wrapProgram $out/bin/$a --prefix LD_LIBRARY_PATH : ${cups}/lib
done done
''; '';
@ -147,7 +152,7 @@ stdenv.mkDerivation rec {
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi mesa getopt file jdk cairo which icu boost libXext libX11 libXtst libXi mesa
cups libXinerama openssl gperf GConf ORBit2 gnome_vfs gstreamer gst_plugins_base 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 = { meta = {