MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

firefoxPackages: move old firefox flags under isTorBrowserLike

Browse source
This commit is contained in:
SLNOS 2017-11-15 00:00:00 +00:00 committed by Jan Malakhovski
parent 3d8260fcf6
commit d838fbe2b3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -143,7 +143,7 @@ stdenv.mkDerivation (rec {
] ]
# and wants these # and wants these
++ lib.optionals isTorBrowserLike [ ++ lib.optionals isTorBrowserLike ([
"--with-tor-browser-version=${version}" "--with-tor-browser-version=${version}"
"--enable-signmar" "--enable-signmar"
"--enable-verify-mar" "--enable-verify-mar"
@ -153,7 +153,9 @@ stdenv.mkDerivation (rec {
# possibilities on other platforms. # possibilities on other platforms.
# Lets save some space instead. # Lets save some space instead.
"--with-system-nspr" "--with-system-nspr"
] ] ++ flag geolocationSupport "mozril-geoloc"
++ flag safeBrowsingSupport "safe-browsing"
)
++ flag alsaSupport "alsa" ++ flag alsaSupport "alsa"
++ flag pulseaudioSupport "pulseaudio" ++ flag pulseaudioSupport "pulseaudio"
@ -161,10 +163,8 @@ stdenv.mkDerivation (rec {
++ flag gssSupport "negotiateauth" ++ flag gssSupport "negotiateauth"
++ lib.optional (!ffmpegSupport) "--disable-gstreamer" ++ lib.optional (!ffmpegSupport) "--disable-gstreamer"
++ flag webrtcSupport "webrtc" ++ flag webrtcSupport "webrtc"
++ flag geolocationSupport "mozril-geoloc"
++ lib.optional googleAPISupport "--with-google-api-keyfile=ga" ++ lib.optional googleAPISupport "--with-google-api-keyfile=ga"
++ flag crashreporterSupport "crashreporter" ++ flag crashreporterSupport "crashreporter"
++ flag safeBrowsingSupport "safe-browsing"
++ lib.optional drmSupport "--enable-eme=widevine" ++ lib.optional drmSupport "--enable-eme=widevine"
++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]