diff options
author | Александр Цамутали <astsmtl@yandex.ru> | 2013-02-03 22:17:33 +0400 |
---|---|---|
committer | Александр Цамутали <astsmtl@yandex.ru> | 2013-02-03 22:17:33 +0400 |
commit | a6ada4b3f9901efe3955af35862e7b6c2acd1909 (patch) | |
tree | 7ad28d1d0b5f25b39c41d1e981e57b529f0ef7f3 /pkgs | |
parent | 52d265fd12b49c8f7e0b593231a797e72f15c76e (diff) |
firefoxWrapper: Fix Quake Live support.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c00a2dcd2726..d65840d153c78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 [ ]; }; |