diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-01 15:07:52 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-01 15:07:52 +0000 |
| commit | c036d1d48f4ed8c7f64e355f2dafe350c33fbe16 (patch) | |
| tree | 3c10014fc9ba994e476e2c74ad6cc87debf26346 /pkgs/top-level | |
| parent | 4a3bff8a19dd42b2e08e4e2cd65dee270fb6a506 (diff) | |
| download | nixlib-c036d1d48f4ed8c7f64e355f2dafe350c33fbe16.tar nixlib-c036d1d48f4ed8c7f64e355f2dafe350c33fbe16.tar.gz nixlib-c036d1d48f4ed8c7f64e355f2dafe350c33fbe16.tar.bz2 nixlib-c036d1d48f4ed8c7f64e355f2dafe350c33fbe16.tar.lz nixlib-c036d1d48f4ed8c7f64e355f2dafe350c33fbe16.tar.xz nixlib-c036d1d48f4ed8c7f64e355f2dafe350c33fbe16.tar.zst nixlib-c036d1d48f4ed8c7f64e355f2dafe350c33fbe16.zip | |
* Adobe Reader 7.0.9.
* Renamed the Flash Player directories. svn path=/nixpkgs/trunk/; revision=7831
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da9803636803..22f05dd7b92a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 []) |