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

firefox-wrapper: use gstreamer hook

Browse Source
This commit is contained in:
Benno Fünfstück 2014-12-05 20:13:41 +01:00
parent effaa51680
commit e177e90b9b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ stdenv.mkDerivation {
categories = "Application;Network;WebBrowser;"; categories = "Application;Network;WebBrowser;";
}; };
buildInputs = [makeWrapper]; buildInputs = [makeWrapper] ++ gst_plugins;
buildCommand = '' buildCommand = ''
if [ ! -x "${browser}/bin/${browserName}" ] if [ ! -x "${browser}/bin/${browserName}" ]
@ -32,7 +32,7 @@ stdenv.mkDerivation {
--suffix-each LD_LIBRARY_PATH ':' "$libs" \ --suffix-each LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \ --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)))" \
--suffix-each GST_PLUGIN_PATH ':' "$gst_plugins" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
mkdir -p $out/share/applications mkdir -p $out/share/applications
@ -49,7 +49,6 @@ 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;
gst_plugins = map (x: x + "/lib/gstreamer-0.10") gst_plugins;
gtk_modules = map (x: x + x.gtkModule) gtk_modules; gtk_modules = map (x: x + x.gtkModule) gtk_modules;
meta = { meta = {