Author: astsmtl
Date: Mon Dec 12 17:25:51 2011
New Revision: 30856
URL: https://nixos.org/websvn/nix/?rev=30856&sc=1
Log:
Added support for Quake Live to Firefox wrapper.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/wrapper.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/wrapper.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/wrapper.nix
Mon Dec 12 17:14:59 2011 (r30855)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/wrapper.nix
Mon Dec 12 17:25:51 2011 (r30856)
@@ -1,4 +1,4 @@
-{ stdenv, browser, makeDesktopItem, makeWrapper, plugins
+{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs
, browserName, desktopName, nameSuffix, icon
}:
@@ -27,6 +27,7 @@
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 @@
# 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 =
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Dec 12 17:14:59
2011 (r30855)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Dec 12 17:25:51
2011 (r30856)
@@ -7557,6 +7557,10 @@
++ 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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
