firefoxWrapper: Fix Quake Live support.
This commit is contained in:
parent
52d265fd12
commit
a6ada4b3f9
@ -8047,14 +8047,14 @@ let
|
||||
wrapFirefox =
|
||||
{ browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? ""
|
||||
, icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }:
|
||||
let
|
||||
cfg = stdenv.lib.attrByPath [ browserName ] {} config;
|
||||
enableAdobeFlash = cfg.enableAdobeFlash or true;
|
||||
enableGnash = cfg.enableGnash or false;
|
||||
in
|
||||
import ../applications/networking/browsers/firefox/wrapper.nix {
|
||||
inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
|
||||
plugins =
|
||||
let
|
||||
cfg = stdenv.lib.attrByPath [ browserName ] {} config;
|
||||
enableAdobeFlash = cfg.enableAdobeFlash or true;
|
||||
enableGnash = cfg.enableGnash or false;
|
||||
in
|
||||
assert !(enableGnash && enableAdobeFlash);
|
||||
([ ]
|
||||
++ lib.optional enableGnash gnash
|
||||
@ -8066,7 +8066,7 @@ let
|
||||
++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
|
||||
);
|
||||
libs =
|
||||
if config.browserName.enableQuakeLive or false
|
||||
if cfg.enableQuakeLive or false
|
||||
then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]
|
||||
else [ ];
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user