about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/firefox
diff options
context:
space:
mode:
authorAndrew Childs <lorne@cons.org.nz>2019-04-06 23:49:14 +0900
committerAndrew Childs <lorne@cons.org.nz>2019-04-07 02:31:22 +0900
commit5a8ddeea734d502de2edbe76c7fff61ebc1e52c0 (patch)
treec86b537f15cd9cb2844ccfac8585ad6e7be92070 /pkgs/applications/networking/browsers/firefox
parent79016d9f404fdce9b58fc5d1b9db080cef3cfc50 (diff)
downloadnixlib-5a8ddeea734d502de2edbe76c7fff61ebc1e52c0.tar
nixlib-5a8ddeea734d502de2edbe76c7fff61ebc1e52c0.tar.gz
nixlib-5a8ddeea734d502de2edbe76c7fff61ebc1e52c0.tar.bz2
nixlib-5a8ddeea734d502de2edbe76c7fff61ebc1e52c0.tar.lz
nixlib-5a8ddeea734d502de2edbe76c7fff61ebc1e52c0.tar.xz
nixlib-5a8ddeea734d502de2edbe76c7fff61ebc1e52c0.tar.zst
nixlib-5a8ddeea734d502de2edbe76c7fff61ebc1e52c0.zip
firefox: re-enable webrtc on aarch64 (64+); fix comment
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
-rw-r--r--pkgs/applications/networking/browsers/firefox/common.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 15de1a763d90..670cbb34260b 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -30,11 +30,13 @@
 , privacySupport ? isTorBrowserLike || isIceCatLike
 
 # WARNING: NEVER set any of the options below to `true` by default.
-# Set to `privacySupport` or `false`.
+# Set to `!privacySupport` or `false`.
 
-# webrtcSupport breaks the aarch64 build on version >= 60.
+# webrtcSupport breaks the aarch64 build on version >= 60, fixed in 63.
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1434589
-, webrtcSupport ? (if lib.versionAtLeast ffversion "60" && stdenv.isAarch64 then false else !privacySupport)
+, webrtcSupport ? !privacySupport && (!stdenv.isAarch64 || !(
+    lib.versionAtLeast ffversion "60" && lib.versionOlder ffversion "63"
+  ))
 , geolocationSupport ? !privacySupport
 , googleAPISupport ? geolocationSupport
 , crashreporterSupport ? false