From 73eead9f13157aa2c3b3b84457e7d982ba5220d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 8 Mar 2014 21:24:03 +0100 Subject: [PATCH] libreoffice: add deps needed now (libXdmcp, libpthreadstubs) Configure phase passes now. --- pkgs/applications/office/libreoffice/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 58e657f8b2e..5918f0612ce 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,10 +6,10 @@ { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd -, libxml2, db, sablotron, curl, libXaw, fontconfig, libsndfile, neon +, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups -, libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler +, icu, boost, jdk, ant, cups, xorg +, openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra @@ -246,13 +246,14 @@ stdenv.mkDerivation rec { make slowcheck ''; - buildInputs = + buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 - libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes + libXaw libXext libXi libXinerama libxml2 libxslt libXtst + libXdmcp libpthreadstubs 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 liborcus liblangtag