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

firefoxWrapper: Fix Quake Live support.

Browse Source
This commit is contained in:
Александр Цамутали 2013-02-03 22:17:33 +04:00
parent 52d265fd12
commit a6ada4b3f9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8047,14 +8047,14 @@ let
wrapFirefox = wrapFirefox =
{ browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? ""
, icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }: , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }:
import ../applications/networking/browsers/firefox/wrapper.nix {
inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
plugins =
let let
cfg = stdenv.lib.attrByPath [ browserName ] {} config; cfg = stdenv.lib.attrByPath [ browserName ] {} config;
enableAdobeFlash = cfg.enableAdobeFlash or true; enableAdobeFlash = cfg.enableAdobeFlash or true;
enableGnash = cfg.enableGnash or false; enableGnash = cfg.enableGnash or false;
in in
import ../applications/networking/browsers/firefox/wrapper.nix {
inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
plugins =
assert !(enableGnash && enableAdobeFlash); assert !(enableGnash && enableAdobeFlash);
([ ] ([ ]
++ lib.optional enableGnash gnash ++ lib.optional enableGnash gnash
@ -8066,7 +8066,7 @@ let
++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
); );
libs = libs =
if config.browserName.enableQuakeLive or false if cfg.enableQuakeLive or false
then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]
else [ ]; else [ ];
}; };