diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-25 12:55:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-25 12:55:24 +0200 |
| commit | 9595dc587f137fed1d611867c84bc71fa0776f48 (patch) | |
| tree | 1fcddf93821978b6c016d5e439d91799fdf5148a /pkgs/applications | |
| parent | 06eeb0d158829287bb26e01b6ffcf44955c876e1 (diff) | |
| parent | c1740904aeb574ac5f01c63c5c39480724cff7ed (diff) | |
| download | nixlib-9595dc587f137fed1d611867c84bc71fa0776f48.tar nixlib-9595dc587f137fed1d611867c84bc71fa0776f48.tar.gz nixlib-9595dc587f137fed1d611867c84bc71fa0776f48.tar.bz2 nixlib-9595dc587f137fed1d611867c84bc71fa0776f48.tar.lz nixlib-9595dc587f137fed1d611867c84bc71fa0776f48.tar.xz nixlib-9595dc587f137fed1d611867c84bc71fa0776f48.tar.zst nixlib-9595dc587f137fed1d611867c84bc71fa0776f48.zip | |
Merge pull request #42547 from tadfisher/firefox-u2f
firefox: add u2f support
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6067911b7165..c2b83a0187f8 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -66,10 +66,11 @@ let ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration ++ extraNativeMessagingHosts ); - libs = lib.optional ffmpegSupport ffmpeg + libs = [ libudev ] + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) - (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; gtk_modules = [ libcanberra-gtk2 ]; |