From e542ee6e4f68956727c8a1168cde5afc2bf7200c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Nov 2005 11:34:47 +0000
Subject: [PATCH] * Build Acrobat Reader with Xinerama support.  May or may not
 be useful.

svn path=/nixpkgs/trunk/; revision=4181
---
 pkgs/applications/misc/acrobat-reader/default.nix | 10 ++++++++--
 pkgs/system/all-packages-generic.nix              |  8 +++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/acrobat-reader/default.nix b/pkgs/applications/misc/acrobat-reader/default.nix
index f1e12fc02cf..c23a9f71352 100644
--- a/pkgs/applications/misc/acrobat-reader/default.nix
+++ b/pkgs/applications/misc/acrobat-reader/default.nix
@@ -1,4 +1,7 @@
-{stdenv, fetchurl, libXt, libXp, libXext, libX11, glib, pango, atk, gtk, libstdcpp5, zlib}:
+{ xineramaSupport ? false
+, stdenv, fetchurl, libXt, libXp, libXext, libX11, libXinerama ? null
+, glib, pango, atk, gtk, libstdcpp5, zlib
+}:
 
 stdenv.mkDerivation {
   name = "acrobat-reader-7.0.1";
@@ -7,5 +10,8 @@ stdenv.mkDerivation {
     url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz;
     md5 = "79e5a40aca6b49f7015cb1694876f87a";
   };
-  libPath = [libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib];
+  libPath = [
+    libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib
+    (if xineramaSupport then libXinerama else null)
+  ];
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 8fe78c2c20d..40ce7a9febe 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1401,6 +1401,11 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  fuse = import ../os-specific/linux/fuse {
+    inherit fetchurl stdenv;
+  };
+
+  
   ### DATA
 
   docbook_xml_dtd_42 = (import ../data/sgml+xml/schemas/xml-dtd/docbook-4.2) {
@@ -1677,9 +1682,10 @@ rec {
 
   acroread = (import ../applications/misc/acrobat-reader) {
     inherit fetchurl stdenv zlib;
-    inherit (xlibs) libXt libXp libXext libX11;
+    inherit (xlibs) libXt libXp libXext libX11 libXinerama;
     inherit (gtkLibs) glib pango atk gtk;
     libstdcpp5 = gcc33.gcc;
+    xineramaSupport = true;
   };
 
   eclipse = (import ../applications/editors/eclipse) {