* Acrobat Reader -> Adobe Reader, and updated to version 9.0.1.

Removed the fastStart option; it seems to start fast enough without
  it nowadays.  Include CUPS in the RPATH so that the printer dialog
  box shows actual printers (especially useful since KDE 4 no longer
  include the kprinter program ;-).

svn path=/nixpkgs/trunk/; revision=15570

pkgs/applications/misc/acrobat-reader/builder.sh

@@ -1,29 +0,0 @@
-source $stdenv/setup
-
-echo "unpacking $src..."
-tar xvfz $src
-
-mkdir $out
-
-echo "unpacking reader..."
-tar xvf AdobeReader/COMMON.TAR -C $out
-tar xvf AdobeReader/ILINXR.TAR -C $out
-
-# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it).
-rm $out/Reader/intellinux/plug_ins/PPKLite.api
-
-if test -n "$fastStart"; then
-    echo "removing plugins..."
-    rm -v $(ls $out/Reader/intellinux/plug_ins/*.api | grep -v SearchFind)
-fi
-
-fullPath=
-for i in $libPath; do
-    fullPath=$fullPath${fullPath:+:}$i/lib
-done
-
-patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-    --set-rpath $fullPath \
-    $out/Reader/intellinux/bin/acroread
-
-substituteInPlace $out/bin/acroread --replace /lib:/usr/lib /no-such-path --replace /bin/pwd pwd

pkgs/applications/misc/acrobat-reader/default.nix

@@ -1,30 +0,0 @@
-{ xineramaSupport ? false
-, stdenv, fetchurl, libXt, libXp, libXext, libX11, libXinerama ? null
-, glib, pango, atk, gtk, libstdcpp5, zlib
-, fastStart ? false
-}:
-
-assert stdenv.system == "i686-linux";
-
-stdenv.mkDerivation {
-  name = "acrobat-reader-7.0.9";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/AdobeReader_enu-7.0.9-1.i386.tar.gz;
-    sha256 = "0qs8v57gamkk243f44yqxic93izf0bn2d9l4wwbqqy1jv5s125hy";
-  };
-  
-  libPath = [
-    libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib
-    (if xineramaSupport then libXinerama else null)
-  ];
-  
-  inherit fastStart;
-  
-  meta = {
-    description = "Adobe Reader, a viewer for PDF documents";
-    homepage = http://www.adobe.com/products/reader;
-  };
-}

pkgs/applications/misc/adobe-reader/builder.sh

@@ -0,0 +1,26 @@
+source $stdenv/setup
+
+echo "unpacking $src..."
+tar xvfa $src
+
+ensureDir $out
+
+echo "unpacking reader..."
+tar xvf AdobeReader/COMMON.TAR -C $out
+tar xvf AdobeReader/ILINXR.TAR -C $out
+
+# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it).
+rm $out/Adobe/Reader*/Reader/intellinux/plug_ins/PPKLite.api
+
+patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+    --set-rpath $libPath \
+    $out/Adobe/Reader*/Reader/intellinux/bin/acroread
+
+# The "xargs -r" is to shut up a warning when Mozilla can't be found.
+substituteInPlace $out/Adobe/Reader*/bin/acroread \
+    --replace /bin/pwd $(type -P pwd) \
+    --replace /bin/ls $(type -P ls) \
+    --replace xargs "xargs -r"
+
+ensureDir $out/bin
+ln -s $out/Adobe/Reader*/bin/acroread $out/bin/acroread

pkgs/applications/misc/adobe-reader/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, libX11, cups, glib, pango, atk, gtk, zlib, libxml2 }:
+
+assert stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "adobe-reader-9.1.0-1";
+  
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/enu/AdbeRdr9.1.0-1_i486linux_enu.tar.bz2;
+    sha256 = "0liynlmpgmb23fpmbh83mjzfmq798q1rbpymxjgasc2sn76vd0y7";
+  };
+
+  # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
+  # We should probably remove those and use the regular Nixpkgs
+  # versions.
+  
+  libPath = stdenv.lib.makeLibraryPath
+    [ stdenv.gcc.gcc libX11 glib pango atk gtk zlib libxml2 cups ];
+  
+  meta = {
+    description = "Adobe Reader, a viewer for PDF documents";
+    homepage = http://www.adobe.com/products/reader;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -5607,13 +5607,10 @@ let
     inherit (gnome) libglade libgnomeprint libgnomeprintui libgnomecanvas;
   };
 
-  acroread = import ../applications/misc/acrobat-reader {
-    inherit fetchurl stdenv zlib;
-    inherit (xlibs) libXt libXp libXext libX11 libXinerama;
+  adobeReader = import ../applications/misc/adobe-reader {
+    inherit fetchurl stdenv zlib libxml2 cups;
+    inherit (xlibs) libX11;
     inherit (gtkLibs) glib pango atk gtk;
-    libstdcpp5 = gcc33.gcc;
-    xineramaSupport = true;
-    fastStart = getConfig ["acroread" "fastStart"] true;
   };
 
   amsn = import ../applications/networking/instant-messengers/amsn {