From 18439774f8b20470ea7f12f628916c4a1418139e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 Oct 2009 13:08:04 +0000
Subject: [PATCH] * Adobe Reader 9.2.

svn path=/nixpkgs/trunk/; revision=17799
---
 pkgs/applications/misc/adobe-reader/default.nix |  6 +++---
 pkgs/top-level/all-packages.nix                 | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix
index 7f9f2b422d31..00c6a1ef4159 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -3,13 +3,13 @@
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
-  name = "adobe-reader-9.1.1-1";
+  name = "adobe-reader-9.2-1";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1.1/enu/AdbeRdr9.1.1-1_i486linux_enu.tar.bz2;
-    sha256 = "1j3f7d5s7yfm6vg1628f6as462sbm1ika79v0flq0zgljc111vna";
+    url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.2/enu/AdbeRdr9.2-1_i486linux_enu.tar.bz2;
+    sha256 = "0067w0kjj2c04342g8c9qvcs49kkiqlxn2zyx9qzlg7a32qfc9l2";
   };
 
   # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02a4ff3a498a..c4a06f0285fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6310,12 +6310,11 @@ let
     inherit (gnome) libglade libgnomeprint libgnomeprintui libgnomecanvas;
   };
 
-  adobeReader = (
-    import ../applications/misc/adobe-reader {
-      inherit fetchurl stdenv zlib libxml2 cups;
-      inherit (xlibs) libX11;
-      inherit (gtkLibs) glib pango atk gtk;
-    });
+  adobeReader = import ../applications/misc/adobe-reader {
+    inherit fetchurl stdenv zlib libxml2 cups;
+    inherit (xlibs) libX11;
+    inherit (gtkLibs) glib pango atk gtk;
+  };
 
   amsn = import ../applications/networking/instant-messengers/amsn {
     inherit fetchurl stdenv which tcl tk x11;