* Adobe Reader 7.0.9.

* Renamed the Flash Player directories.

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

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

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

pkgs/top-level/all-packages.nix

@@ -2436,7 +2436,7 @@ rec {
     inherit (gtkLibs) glib pango atk gtk;
     libstdcpp5 = gcc33.gcc;
     xineramaSupport = true;
-    fastStart = true;
+    fastStart = getConfig ["acroread" "fastStart"] false;
   };
 
   amsn = import ../applications/networking/instant-messengers/amsn {
@@ -2546,14 +2546,15 @@ rec {
     inherit fetchurl stdenv libogg;
   };
 
-  flashplayer = import ../applications/networking/browsers/mozilla-plugins/flashplayer {
+  flashplayer = flashplayer9;
+
+  flashplayer7 = import ../applications/networking/browsers/mozilla-plugins/flashplayer-7 {
     inherit fetchurl stdenv zlib;
     inherit (xlibs) libXmu;
   };
 
-  flashplayer9beta = import ../applications/networking/browsers/mozilla-plugins/flashplayer-9-beta {
+  flashplayer9 = import ../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
     inherit fetchurl stdenv zlib alsaLib;
-#    inherit (xlibs) libXmu;
   };
 
   fspot = import ../applications/graphics/f-spot {
@@ -2818,7 +2819,7 @@ rec {
     inherit stdenv firefox;
     plugins = [
       MPlayerPlugin
-      flashplayer9beta
+      flashplayer
     ]
     # RealPlayer is disabled by default for legal reasons.
     ++ (if getConfig ["firefox" "enableRealPlayer"] false then [RealPlayer] else [])