From 47d7e060a5d94641f24bebe8c20b2ac036683418 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Mar 2005 15:16:40 +0000
Subject: [PATCH] * Acrobat Reader upgraded to 5.0.10. * Removed acroread
 dependency on patchelf (it's in stdenv).

svn path=/nixpkgs/trunk/; revision=2418
---
 pkgs/applications/misc/acrobat-reader/builder.sh  | 7 ++++---
 pkgs/applications/misc/acrobat-reader/default.nix | 9 ++++-----
 pkgs/system/all-packages-generic.nix              | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/acrobat-reader/builder.sh b/pkgs/applications/misc/acrobat-reader/builder.sh
index 89774f26fb8..e9966fcbfdb 100644
--- a/pkgs/applications/misc/acrobat-reader/builder.sh
+++ b/pkgs/applications/misc/acrobat-reader/builder.sh
@@ -6,16 +6,17 @@ tar xvfz $src
 mkdir $out
 
 echo "unpacking reader..."
-tar xvf ./COMMON.TAR -C $out
-tar xvf ./LINUXRDR.TAR -C $out
+tar xvf installers/COMMON.TAR -C $out
+tar xvf installers/LINUXRDR.TAR -C $out
 
 glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
 
 patchelf --interpreter $glibc/lib/ld-linux.so.* $out/Reader/intellinux/bin/acroread
 
 sed "s^REPLACE_ME^$out/Reader^" $out/bin/acroread.sh > $out/bin/acroread.sh.tmp
-echo "#! /bin/sh" > $out/bin/acroread.sh
+echo "#! $SHELL" > $out/bin/acroread.sh
 echo "LD_LIBRARY_PATH=$libXt/lib:$libXp/lib:$libXext/lib:$libX11/lib" >> $out/bin/acroread.sh
 cat $out/bin/acroread.sh.tmp >> $out/bin/acroread.sh
+rm $out/bin/acroread.sh.tmp
 chmod 755 $out/bin/acroread.sh
 mv $out/bin/acroread.sh $out/bin/acroread
diff --git a/pkgs/applications/misc/acrobat-reader/default.nix b/pkgs/applications/misc/acrobat-reader/default.nix
index cba6c08f207..665ba69bdce 100644
--- a/pkgs/applications/misc/acrobat-reader/default.nix
+++ b/pkgs/applications/misc/acrobat-reader/default.nix
@@ -1,12 +1,11 @@
-{stdenv, fetchurl, patchelf, libXt, libXp, libXext, libX11}:
+{stdenv, fetchurl, libXt, libXp, libXext, libX11}:
 
 stdenv.mkDerivation {
-  name = "acrobat-reader-5.0.9";
+  name = "acrobat-reader-5.0.10";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-509.tar.gz;
-    md5 = "53b7ca0fc83ab81214ba82050ce89c64";
+    url = http://ardownload.adobe.com/pub/adobe/acrobatreader/unix/5.x/linux-5010.tar.gz;
+    md5 = "9721b85d54aab1d9ece37758cc6d64f2";
   };
-  buildInputs = [patchelf];
   inherit libXt libXp libXext libX11;
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 592569960b5..0f072f7145a 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -499,7 +499,7 @@ rec {
   apacheAntBlackdown14 = (import ../development/tools/build-managers/apache-ant) {
     inherit fetchurl stdenv;
     j2sdk = blackdown;
-     name = "ant-blackdown-1.4.2";
+    name = "ant-blackdown-1.4.2";
   };
 
   apacheAnt15 = (import ../development/tools/build-managers/apache-ant) {
@@ -1171,7 +1171,7 @@ rec {
   };
 
   acroread = (import ../applications/misc/acrobat-reader) {
-    inherit fetchurl stdenv patchelf;
+    inherit fetchurl stdenv;
     inherit (xlibs) libXt libXp libXext libX11;
   };