diff options
| author | SLNOS <anonymous@wired> | 2017-08-15 00:00:00 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2017-09-04 20:19:52 +0000 |
| commit | a681afb8f1ab80e6c7a3fb587d49b15c2d3739c7 (patch) | |
| tree | f72ff7a0c1221e0cc08e5b563c8a5b58f5a9be97 /pkgs/applications/networking/browsers/firefox/common.nix | |
| parent | 344fbb5ddbb90cd1943730f42acbec8856a9b9dd (diff) | |
| download | nixpkgs-a681afb8f1ab80e6c7a3fb587d49b15c2d3739c7.tar nixpkgs-a681afb8f1ab80e6c7a3fb587d49b15c2d3739c7.tar.gz nixpkgs-a681afb8f1ab80e6c7a3fb587d49b15c2d3739c7.tar.bz2 nixpkgs-a681afb8f1ab80e6c7a3fb587d49b15c2d3739c7.tar.lz nixpkgs-a681afb8f1ab80e6c7a3fb587d49b15c2d3739c7.tar.xz nixpkgs-a681afb8f1ab80e6c7a3fb587d49b15c2d3739c7.tar.zst nixpkgs-a681afb8f1ab80e6c7a3fb587d49b15c2d3739c7.zip | |
firefoxPackages: add `extraMakeFlags` to common builder, fix official branding handling
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index be24dd4a376..de19e611851 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 ? [], extraConfigureFlags ? [], overrides ? {}, meta +, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? [], overrides ? {}, meta , isTorBrowserLike ? false }: { lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL @@ -43,7 +43,7 @@ # option. However, in Firefox's case, those binaries may not be # distributed without permission from the Mozilla Foundation, see # http://www.mozilla.org/foundation/trademarks/. -, enableOfficialBranding ? false +, enableOfficialBranding ? isTorBrowserLike }: assert stdenv.cc ? libc && stdenv.cc.libc != null; @@ -158,6 +158,16 @@ stdenv.mkDerivation (rec { ++ lib.optional enableOfficialBranding "--enable-official-branding" ++ extraConfigureFlags; + preBuild = lib.optionalString (enableOfficialBranding && isTorBrowserLike) '' + buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser") + ''; + + makeFlags = lib.optionals enableOfficialBranding [ + "MOZILLA_OFFICIAL=1" + "BUILD_OFFICIAL=1" + ] + ++ extraMakeFlags; + enableParallelBuilding = true; preInstall = '' |