diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6a00dfcd8c1..eba0deb627e 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 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { categories = "Application;Network;WebBrowser;"; }; - buildInputs = [makeWrapper]; + buildInputs = [makeWrapper] ++ gst_plugins; buildCommand = '' if [ ! -x "${browser}/bin/${browserName}" ] @@ -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)))" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" mkdir -p $out/share/applications diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 205f6758df6..b75f4c0c1d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11162,6 +11162,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 ]; };