diff options
author | S. Nordin Abouzahra <abouzahra.9@wright.edu> | 2020-10-21 21:47:30 -0400 |
---|---|---|
committer | Benjamin Hipple <bhipple@protonmail.com> | 2020-10-29 22:21:12 -0400 |
commit | 57ea265674f8e23ede036bd72cf437da7e110c4d (patch) | |
tree | c03390053f46cccb0995febb8366781692b980e4 /pkgs/applications/networking/browsers | |
parent | 4506d174c68a0f3d6d4ad009b21d202b5fe52f32 (diff) | |
download | nixpkgs-57ea265674f8e23ede036bd72cf437da7e110c4d.tar nixpkgs-57ea265674f8e23ede036bd72cf437da7e110c4d.tar.gz nixpkgs-57ea265674f8e23ede036bd72cf437da7e110c4d.tar.bz2 nixpkgs-57ea265674f8e23ede036bd72cf437da7e110c4d.tar.lz nixpkgs-57ea265674f8e23ede036bd72cf437da7e110c4d.tar.xz nixpkgs-57ea265674f8e23ede036bd72cf437da7e110c4d.tar.zst nixpkgs-57ea265674f8e23ede036bd72cf437da7e110c4d.zip |
firefox: place alsaLib in lib search patch
libcubeb has dlopened libraries for awhile now. In nixpkgs there was support for the PulseAudio backend doing this, however the ALSA backend support was missed and caused issue #79310 (no sound with ALSA). This gives ALSA users the ability to hear sound once again.
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index c787fb5754d..03cf35e1a6b 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -333,6 +333,7 @@ buildStdenv.mkDerivation ({ version = ffversion; isFirefox3Like = true; gtk = gtk2; + inherit alsaSupport; inherit nspr; inherit ffmpegSupport; inherit gssSupport; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 424c45d305e..9c8625495b2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd +, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd , gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native @@ -39,6 +39,7 @@ let enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; + alsaSupport = browser.alsaSupport or false; plugins = let @@ -76,6 +77,7 @@ let (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 + ++ lib.optional alsaSupport alsaLib ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk2 ]; |