* Adobe Reader 7.0.9.

* Renamed the Flash Player directories.

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

6 files changed, 5 insertions, 3 deletions

diff --git a/pkgs/applications/misc/acrobat-reader/builder.sh b/pkgs/applications/misc/acrobat-reader/builder.sh
index d37919858f72..bcbdb85e9766 100644
--- a/pkgs/applications/misc/acrobat-reader/builder.sh
+++ b/pkgs/applications/misc/acrobat-reader/builder.sh
@@ -25,3 +25,5 @@ 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
diff --git a/pkgs/applications/misc/acrobat-reader/default.nix b/pkgs/applications/misc/acrobat-reader/default.nix
index e603141a86c9..deaac7917747 100644
--- a/pkgs/applications/misc/acrobat-reader/default.nix
+++ b/pkgs/applications/misc/acrobat-reader/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "acrobat-reader-7.0.1";
+  name = "acrobat-reader-7.0.9";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz;
-    md5 = "79e5a40aca6b49f7015cb1694876f87a";
+    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
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh
index 9c8e423ce6df..9c8e423ce6df 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix
index 776e926acd5c..776e926acd5c 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
index 78788a358b00..78788a358b00 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/builder.sh
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
index 3ea8495d7c77..3ea8495d7c77 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix