From 9e4bee5270adbfa498eb1bc36be58fac753aaaf7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 4 Jun 2013 20:00:13 +0400
Subject: [PATCH] Fixing LibreOffice configure for now

---
 .../applications/office/libreoffice/default.nix | 17 ++++++++++++-----
 pkgs/top-level/all-packages.nix                 |  3 ++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index fc5f5058f97b..34a8ee25765d 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -7,7 +7,9 @@
 , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus_glib, qt4, kde4, clucene_core_2, libcdr, lcms2, vigra
-, libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio
+, libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio, libdrm
+, libXdamage, damageproto, fixesproto, libXfixes, libxcb
+, libXxf86vm, xf86vidmodeproto
 , fontsConf
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ]
 }:
@@ -163,13 +165,18 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core_2
-      CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig
+      CompressZlib cppunit cups curl damageproto
+      db4 dbus_glib expat file fixesproto flex fontconfig
       freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk
-      hunspell icu jdk kde4.kdelibs lcms2 libcdr libexttextcat libiodbc libjpeg
+      hunspell icu jdk kde4.kdelibs lcms2 libcdr libdrm 
+      libexttextcat libiodbc libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
-      libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes
+      libXaw libxcb libXdamage 
+      libXext libXfixes libXi libXinerama 
+      libxml2 libxslt libXtst libXxf86vm mdds mesa mythes
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
-      python sablotron saneBackends tcsh unzip vigra which zip zlib
+      python sablotron saneBackends tcsh unzip vigra xf86vidmodeproto
+      which zip zlib
     ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0148e125a71d..80110853991e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7553,7 +7553,8 @@ let
 
   libreoffice = callPackage ../applications/office/libreoffice {
     inherit (perlPackages) ArchiveZip CompressZlib;
-    inherit (gnome) GConf ORBit2 gnome_vfs;
+    inherit (gnome2) GConf ORBit2 gnome_vfs;
+    gtk = gtk2;
     zip = zip.override { enableNLS = false; };
     boost = boost149;
     jdk = openjdk;