From 939a0d3b4a60979d8617aad0aaea056f4293bc84 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 15:48:02 +0100 Subject: [PATCH] firefox: enable gstreamer for h.264 support in HTML5 video --- pkgs/applications/networking/browsers/firefox/default.nix | 1 + pkgs/top-level/all-packages.nix | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 47e6d20cc9a..27363482be0 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -47,6 +47,7 @@ rec { "--enable-system-pixman" "--enable-system-sqlite" "--enable-system-cairo" + "--enable-gstreamer" "--enable-startup-notification" # "--enable-content-sandbox" # available since 26.0, but not much info available # "--enable-content-sandbox-reporter" # keeping disabled for now diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9609334820..e9c59d9ad67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9193,10 +9193,8 @@ let ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid ); - libs = - if cfg.enableQuakeLive or false - then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] - else [ ]; + libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) + (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); gtk_modules = [ libcanberra ]; };