Added support for Quake Live to Firefox wrapper.
svn path=/nixpkgs/trunk/; revision=30856
This commit is contained in:
parent
b0834a993e
commit
7e82cfb7d6
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, browser, makeDesktopItem, makeWrapper, plugins
|
{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs
|
||||||
, browserName, desktopName, nameSuffix, icon
|
, browserName, desktopName, nameSuffix, icon
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -27,6 +27,7 @@ stdenv.mkDerivation {
|
|||||||
makeWrapper "${browser}/bin/${browserName}" \
|
makeWrapper "${browser}/bin/${browserName}" \
|
||||||
"$out/bin/${browserName}${nameSuffix}" \
|
"$out/bin/${browserName}${nameSuffix}" \
|
||||||
--suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
|
--suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
|
||||||
|
--suffix-each LD_LIBRARY_PATH ':' "$libs" \
|
||||||
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
|
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
|
||||||
|
|
||||||
ensureDir $out/share/applications
|
ensureDir $out/share/applications
|
||||||
@ -36,6 +37,7 @@ stdenv.mkDerivation {
|
|||||||
# Let each plugin tell us (through its `mozillaPlugin') attribute
|
# Let each plugin tell us (through its `mozillaPlugin') attribute
|
||||||
# where to find the plugin in its tree.
|
# where to find the plugin in its tree.
|
||||||
plugins = map (x: x + x.mozillaPlugin) plugins;
|
plugins = map (x: x + x.mozillaPlugin) plugins;
|
||||||
|
libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description =
|
description =
|
||||||
|
@ -7557,6 +7557,10 @@ let
|
|||||||
++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin
|
++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin
|
||||||
++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin
|
++ 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 { };
|
x11vnc = callPackage ../tools/X11/x11vnc { };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user