diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-16 11:20:47 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-16 11:20:47 +0000 |
| commit | bba42d4821c3a48ce2b9d61cede863f9c685340b (patch) | |
| tree | 133cdb8b16b04da184b199b89c6e454731a4d725 /pkgs/top-level | |
| parent | c888ed7499ddcac51cc47085fe5f7137fa86a425 (diff) | |
| download | nixlib-bba42d4821c3a48ce2b9d61cede863f9c685340b.tar nixlib-bba42d4821c3a48ce2b9d61cede863f9c685340b.tar.gz nixlib-bba42d4821c3a48ce2b9d61cede863f9c685340b.tar.bz2 nixlib-bba42d4821c3a48ce2b9d61cede863f9c685340b.tar.lz nixlib-bba42d4821c3a48ce2b9d61cede863f9c685340b.tar.xz nixlib-bba42d4821c3a48ce2b9d61cede863f9c685340b.tar.zst nixlib-bba42d4821c3a48ce2b9d61cede863f9c685340b.zip | |
* Firefox: revert to using flashplayer until gnash works better.
* Firefox: disable Java plugin support by default since few people care about it anymore. svn path=/nixpkgs/trunk/; revision=12116
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/build-for-release.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f65d6fecd703..90a45aa7c41b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6481,7 +6481,7 @@ let pkgs = rec { wrapFirefox = firefox: nameSuffix: import ../applications/networking/browsers/firefox-wrapper { inherit stdenv firefox nameSuffix makeWrapper; plugins = - let enableAdobeFlash = getConfig [ "firefox" "enableAdobeFlash" ] false + let enableAdobeFlash = getConfig [ "firefox" "enableAdobeFlash" ] true && system == "i686-linux"; in ([] @@ -6490,7 +6490,7 @@ let pkgs = rec { # RealPlayer is disabled by default for legal reasons. ++ lib.optional (system != "i686-linux" && getConfig ["firefox" "enableRealPlayer"] false) RealPlayer ++ lib.optional (getConfig ["firefox" "enableMPlayer"] true) MPlayerPlugin - ++ lib.optional (supportsJDK && getConfig ["firefox" "jre"] true && jrePlugin ? mozillaPlugin) jrePlugin + ++ lib.optional (supportsJDK && getConfig ["firefox" "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin ); }; diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index 3018b8bef692..9caa6fe2bd07 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -53,7 +53,7 @@ let feh file findutils - firefoxWrapper + firefox flex2533 gawk gcc @@ -234,7 +234,7 @@ let binutils bison23 emacs - firefoxWrapper + firefox gcc hello libtool |