public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7568 from malyn/firefox-hal-flash

Browse Source 
Add enableAdobeFlashDRM option to firefoxWrapper
This commit is contained in:
Edward Tjörnhammar 2015-04-27 00:19:03 +02:00
commit 28192e5fa8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/top-level/all-packages.nix
View File

@ -12451,7 +12451,8 @@ let
++ lib.optional (cfg.enableTrezor or false) trezor-bridge ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
); );
libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
(with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); (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 = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ];
gtk_modules = [ libcanberra ]; gtk_modules = [ libcanberra ];
}; };