diff options
| author | SLNOS <anonymous@wired> | 2017-08-15 00:00:00 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2017-09-04 20:19:50 +0000 |
| commit | 344fbb5ddbb90cd1943730f42acbec8856a9b9dd (patch) | |
| tree | eefef6d91b098907acc459bbe31ba677d88589c9 /pkgs | |
| parent | 828bc3812c9e70692800b703f0c9b123100da7d5 (diff) | |
| download | nixlib-344fbb5ddbb90cd1943730f42acbec8856a9b9dd.tar nixlib-344fbb5ddbb90cd1943730f42acbec8856a9b9dd.tar.gz nixlib-344fbb5ddbb90cd1943730f42acbec8856a9b9dd.tar.bz2 nixlib-344fbb5ddbb90cd1943730f42acbec8856a9b9dd.tar.lz nixlib-344fbb5ddbb90cd1943730f42acbec8856a9b9dd.tar.xz nixlib-344fbb5ddbb90cd1943730f42acbec8856a9b9dd.tar.zst nixlib-344fbb5ddbb90cd1943730f42acbec8856a9b9dd.zip | |
firefoxPackages: add `extraConfigureFlags` to common builder, move `--disable-loop` flag to tor-browser expression
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 7c9ffc0f4784..be24dd4a3762 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,5 +1,5 @@ { pname, version, updateScript ? null -, src, patches ? [], overrides ? {}, meta +, src, patches ? [], extraConfigureFlags ? [], overrides ? {}, meta , isTorBrowserLike ? false }: { lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL @@ -29,7 +29,6 @@ # Set to `privacySupport` or `false`. , webrtcSupport ? !privacySupport -, loopSupport ? !privacySupport || !isTorBrowserLike , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , crashreporterSupport ? false @@ -48,7 +47,6 @@ }: assert stdenv.cc ? libc && stdenv.cc.libc != null; -assert !isTorBrowserLike -> loopSupport; # can't be disabled on firefox :( let flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; @@ -147,8 +145,6 @@ stdenv.mkDerivation (rec { ++ flag ffmpegSupport "ffmpeg" ++ lib.optional (!ffmpegSupport) "--disable-gstreamer" ++ flag webrtcSupport "webrtc" - ++ lib.optionals isTorBrowserLike - (flag loopSupport "loop") ++ flag geolocationSupport "mozril-geoloc" ++ lib.optional googleAPISupport "--with-google-api-keyfile=ga" ++ flag crashreporterSupport "crashreporter" @@ -159,7 +155,8 @@ stdenv.mkDerivation (rec { else [ "--disable-debug" "--enable-release" "--enable-optimize" "--enable-strip" ]) - ++ lib.optional enableOfficialBranding "--enable-official-branding"; + ++ lib.optional enableOfficialBranding "--enable-official-branding" + ++ extraConfigureFlags; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 1eb30bed59cb..fa34b18ee49c 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -49,6 +49,7 @@ rec { pname = "tor-browser"; version = "6.5.2"; isTorBrowserLike = true; + extraConfigureFlags = [ "--disable-loop" ]; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { |