summary refs log tree commit diff
diff options
context:
space:
mode:
authorBenno Fünfstück <benno.fuenfstueck@gmail.com>2014-12-05 13:59:02 +0100
committerBenno Fünfstück <benno.fuenfstueck@gmail.com>2014-12-05 14:22:51 +0100
commiteffaa51680de618d656c906b33d9619c4a3166f9 (patch)
treef3b8aa249fab649496ec1c3d7c2d8b8244462f2b
parentbf3fd50e143c74ad6d2745c82b321e107efa85a5 (diff)
downloadnixlib-effaa51680de618d656c906b33d9619c4a3166f9.tar
nixlib-effaa51680de618d656c906b33d9619c4a3166f9.tar.gz
nixlib-effaa51680de618d656c906b33d9619c4a3166f9.tar.bz2
nixlib-effaa51680de618d656c906b33d9619c4a3166f9.tar.lz
nixlib-effaa51680de618d656c906b33d9619c4a3166f9.tar.xz
nixlib-effaa51680de618d656c906b33d9619c4a3166f9.tar.zst
nixlib-effaa51680de618d656c906b33d9619c4a3166f9.zip
firefox-wrapper: add missing gstreamer plugins
These GStreamer plugins are required for H264 <video> tag support in Firefox.
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix4
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 6a00dfcd8c19..c3e1e86e5591 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, browser, makeDesktopItem, makeWrapper, plugins, libs, gtk_modules
+{ stdenv, lib, browser, makeDesktopItem, makeWrapper, plugins, gst_plugins, libs, gtk_modules
 , browserName, desktopName, nameSuffix, icon
 }:
 
@@ -32,6 +32,7 @@ stdenv.mkDerivation {
         --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 GST_PLUGIN_PATH ':' "$gst_plugins" \
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
 
     mkdir -p $out/share/applications
@@ -48,6 +49,7 @@ stdenv.mkDerivation {
   # 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;
+  gst_plugins = map (x: x + "/lib/gstreamer-0.10") gst_plugins;
   gtk_modules = map (x: x + x.gtkModule) gtk_modules;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a74a6462da34..9e0a2f6ad1df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11154,6 +11154,7 @@ let
          );
       libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
              (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]);
+      gst_plugins = [ gst_plugins_base gst_plugins_good gst_ffmpeg ];
       gtk_modules = [ libcanberra ];
     };