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

Merge pull request #513 from offlinehacker/firefox_libcanberra

Browse Source 
firefoxWrapper: Add libcanberra gtk module to firefox
This commit is contained in:
Evgeny Egorochkin 2013-05-11 14:29:38 -07:00
commit cef9ee5aab
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -1,4 +1,4 @@
{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs { stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs, gtk_modules
, browserName, desktopName, nameSuffix, icon , browserName, desktopName, nameSuffix, icon
}: }:
@ -28,6 +28,7 @@ stdenv.mkDerivation {
"$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" \ --suffix-each LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \
--suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
@ -43,6 +44,7 @@ stdenv.mkDerivation {
# 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; libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs;
gtk_modules = map (x: x + x.gtkModule) gtk_modules;
meta = { meta = {
description = description =

4
pkgs/development/libraries/libcanberra/default.nix
View File

@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-oss --disable-schemas-install"; configureFlags = "--disable-oss --disable-schemas-install";
passthru = {
gtkModule = "/lib/gtk-2.0/";
};
meta = { meta = {
description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications"; description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications";

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

@ -8170,6 +8170,7 @@ let
if cfg.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 [ ];
gtk_modules = [ libcanberra ];
}; };
x11vnc = callPackage ../tools/X11/x11vnc { }; x11vnc = callPackage ../tools/X11/x11vnc { };