From 7e82cfb7d6feb6bdce0e7f5c648966473bdb9876 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Mon, 12 Dec 2011 17:25:51 +0000
Subject: [PATCH] Added support for Quake Live to Firefox wrapper.

svn path=/nixpkgs/trunk/; revision=30856
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 +++-
 pkgs/top-level/all-packages.nix                           | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 0784b79d8bd..b6ec69ee388 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, browser, makeDesktopItem, makeWrapper, plugins
+{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs
 , browserName, desktopName, nameSuffix, icon
 }:
 
@@ -27,6 +27,7 @@ stdenv.mkDerivation {
     makeWrapper "${browser}/bin/${browserName}" \
         "$out/bin/${browserName}${nameSuffix}" \
         --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
+        --suffix-each LD_LIBRARY_PATH ':' "$libs" \
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
 
     ensureDir $out/share/applications
@@ -36,6 +37,7 @@ stdenv.mkDerivation {
   # Let each plugin tell us (through its `mozillaPlugin') attribute
   # where to find the plugin in its tree.
   plugins = map (x: x + x.mozillaPlugin) plugins;
+  libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs;
 
   meta = {
     description =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5ff8291d2e..54ac0298620 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7557,6 +7557,10 @@ let
           ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin
           ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin
          );
+      libs = 
+        if getConfig [ browserName "enableQuakeLive" ] false
+        then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]
+        else [ ];
     };
 
   x11vnc = callPackage ../tools/X11/x11vnc { };