diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-17 11:34:18 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-17 11:34:18 -0700 |
| commit | 48f49a730ed8a4759f6780899053e702f1f3945b (patch) | |
| tree | 4ecf1c71bc9a34baaa32728519c93f4691b49d69 /pkgs/top-level | |
| parent | 1a22ad6b1805d5b90dbe632aae6d91692464db6b (diff) | |
| parent | 69269bebeb22b8ad3b099bc41169f57e29d46efe (diff) | |
Merge pull request #9293 from kmicu/fix-firefox-switch-to-GStreamer-1.0
firefoxWrapper: switch to GStreamer 1.0 This definitely fixes the compatibility issues. @peti We should open an issue to figure out what is wrong with audio for that machine.
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 56b257669aa85..2d742bb53a210 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13265,10 +13265,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 ]; }; |