diff options
author | kmicu <kmicu@protonmail.ch> | 2015-08-17 10:48:26 +0200 |
---|---|---|
committer | kmicu <kmicu@protonmail.ch> | 2015-08-17 10:48:26 +0200 |
commit | 69269bebeb22b8ad3b099bc41169f57e29d46efe (patch) | |
tree | a30cc236f48d48d808b262488968fc9d7ec18c42 /pkgs/top-level | |
parent | f2aeca77722815041ecefa54ecb3c1f297f329f1 (diff) |
firefoxWrapper: switch to GStreamer 1.0
wkennington@f6c1004 switched Firefox to GStreamer 1.0 by changing its buildInput *only*, but that is not enough. We need to fix Firefox wrappers by changing their buildInputs and set GST_PLUGIN_SYSTEM_PATH_1_0 instead of GST_PLUGIN_SYSTEM_PATH. With above changes playing H.264/MP4 media works in firefoxWrapper and conkerorWrapper as tested with http://www.quirksmode.org/html5/tests/video.html and https://soundcloud.com/immclovin33/synthetix-sundays-53-with-marko-maric-19715 It should help with peti#9247 Reviewed-by: kmicu <kmicu@protonmail.ch> Tested-by: kmicu <kmicu@protonmail.ch>
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19353eab4e950..8464193491c51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13259,10 +13259,10 @@ let ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ++ lib.optional (cfg.enableBluejeans or false) bluejeans ); - libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) + libs = (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals (cfg.enableQuakeLive or false) (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash; - gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; + gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ]; gtk_modules = [ libcanberra ]; }; |