public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firefoxPackages: add extraConfigureFlags to common builder, move --disable-loop flag to tor-browser expression

Browse Source
This commit is contained in:
SLNOS 2017-08-15 00:00:00 +00:00 committed by Jan Malakhovski
parent 828bc3812c
commit 344fbb5ddb
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -1,5 +1,5 @@
{ pname, version, updateScript ? null { pname, version, updateScript ? null
, src, patches ? [], overrides ? {}, meta , src, patches ? [], extraConfigureFlags ? [], overrides ? {}, meta
, isTorBrowserLike ? false }: , isTorBrowserLike ? false }:
{ lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL { lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL
@ -29,7 +29,6 @@
# Set to `privacySupport` or `false`. # Set to `privacySupport` or `false`.
, webrtcSupport ? !privacySupport , webrtcSupport ? !privacySupport
, loopSupport ? !privacySupport || !isTorBrowserLike
, geolocationSupport ? !privacySupport , geolocationSupport ? !privacySupport
, googleAPISupport ? geolocationSupport , googleAPISupport ? geolocationSupport
, crashreporterSupport ? false , crashreporterSupport ? false
@ -48,7 +47,6 @@
}: }:
assert stdenv.cc ? libc && stdenv.cc.libc != null; assert stdenv.cc ? libc && stdenv.cc.libc != null;
assert !isTorBrowserLike -> loopSupport; # can't be disabled on firefox :(
let let
flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
@ -147,8 +145,6 @@ stdenv.mkDerivation (rec {
++ flag ffmpegSupport "ffmpeg" ++ flag ffmpegSupport "ffmpeg"
++ lib.optional (!ffmpegSupport) "--disable-gstreamer" ++ lib.optional (!ffmpegSupport) "--disable-gstreamer"
++ flag webrtcSupport "webrtc" ++ flag webrtcSupport "webrtc"
++ lib.optionals isTorBrowserLike
(flag loopSupport "loop")
++ flag geolocationSupport "mozril-geoloc" ++ 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"
@ -159,7 +155,8 @@ stdenv.mkDerivation (rec {
else [ "--disable-debug" "--enable-release" else [ "--disable-debug" "--enable-release"
"--enable-optimize" "--enable-optimize"
"--enable-strip" ]) "--enable-strip" ])
++ lib.optional enableOfficialBranding "--enable-official-branding"; ++ lib.optional enableOfficialBranding "--enable-official-branding"
++ extraConfigureFlags;
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -49,6 +49,7 @@ rec {
pname = "tor-browser"; pname = "tor-browser";
version = "6.5.2"; version = "6.5.2";
isTorBrowserLike = true; isTorBrowserLike = true;
extraConfigureFlags = [ "--disable-loop" ];
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub { src = fetchFromGitHub {