3
0
Fork 0
forked from mirrors/nixpkgs

* 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
This commit is contained in:
Eelco Dolstra 2008-06-16 11:20:47 +00:00
parent c888ed7499
commit bba42d4821
2 changed files with 4 additions and 4 deletions

View file

@ -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
);
};

View file

@ -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