diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-06-13 00:02:20 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-13 00:02:20 +0000 |
commit | 6eeef3eaa80d77ea33cb594588db664417049398 (patch) | |
tree | a0c8524941afe9a0df6fc853584ade05aedacd93 | |
parent | 5f377994ca1eea1c5525245aa73b16fb9f2a1272 (diff) | |
parent | f5cafb7817d4c2b6db188a79b237e5ba8c7381fd (diff) | |
download | nixpkgs-6eeef3eaa80d77ea33cb594588db664417049398.tar nixpkgs-6eeef3eaa80d77ea33cb594588db664417049398.tar.gz nixpkgs-6eeef3eaa80d77ea33cb594588db664417049398.tar.bz2 nixpkgs-6eeef3eaa80d77ea33cb594588db664417049398.tar.lz nixpkgs-6eeef3eaa80d77ea33cb594588db664417049398.tar.xz nixpkgs-6eeef3eaa80d77ea33cb594588db664417049398.tar.zst nixpkgs-6eeef3eaa80d77ea33cb594588db664417049398.zip |
Merge master into staging-next
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index eae5353aeb1..9e3a08cb666 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -88,7 +88,7 @@ , jackSupport ? stdenv.isLinux, libjack2 , jemallocSupport ? true, jemalloc , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages -, pgoSupport ? (stdenv.isLinux && stdenv.isx86_64 && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run +, pgoSupport ? (stdenv.isLinux && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run , pipewireSupport ? waylandSupport && webrtcSupport , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , sndioSupport ? stdenv.isLinux, sndio |