public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changing the 'enableAdobeFlash' firefox/icecat wrapper option, so its negative

Browse Source 
value does not mean "install gnash". I added an enableGnash check instead.

I've kept the default of Adobe Flash.

svn path=/nixpkgs/trunk/; revision=24428
This commit is contained in:
Lluís Batlle i Rossell 2010-10-23 14:42:36 +00:00
parent 3ae506c409
commit 327a2eae30
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/top-level/all-packages.nix
View File

@ -6339,10 +6339,13 @@ let
wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox/wrapper.nix { wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox/wrapper.nix {
inherit stdenv nameSuffix makeWrapper makeDesktopItem browser browserName; inherit stdenv nameSuffix makeWrapper makeDesktopItem browser browserName;
plugins = plugins =
let enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true; let
enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true;
enableGnash = getConfig [ browserName "enableGnash" ] false;
in in
assert !(enableGnash && enableAdobeFlash);
([] ([]
++ lib.optional (!enableAdobeFlash) gnash ++ lib.optional enableGnash gnash
++ lib.optional enableAdobeFlash flashplayer ++ lib.optional enableAdobeFlash flashplayer
# RealPlayer is disabled by default for legal reasons. # RealPlayer is disabled by default for legal reasons.
++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer