diff options
| author | Sean Buckley <sean.bck@gmail.com> | 2021-08-11 20:14:23 -0400 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-08-12 11:04:07 +0000 |
| commit | 8139ad25a3bbadf4c90d2dfbb3a3b37da1a593f3 (patch) | |
| tree | 58d858f5d227f2e388a1697800c1214b632ea960 | |
| parent | Merge pull request #133526 from NixOS/backport-133286-to-release-21.05 (diff) | |
| download | nixpkgs-8139ad25a3bbadf4c90d2dfbb3a3b37da1a593f3.tar.gz | |
firefox: fix enableOfficialBrandingorigin/backport-133571-to-release-21.05
(cherry picked from commit 92908738385789d50b9a1f863f977631de41e92b)
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 588f1a3c1387..49974849b1a5 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -281,7 +281,10 @@ buildStdenv.mkDerivation ({ '') + '' # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 unset AS - ''; + '' + (lib.optionalString enableOfficialBranding '' + export MOZILLA_OFFICIAL=1 + export BUILD_OFFICIAL=1 + ''); configureFlags = [ "--enable-application=browser" @@ -333,11 +336,7 @@ buildStdenv.mkDerivation ({ cd obj-* ''; - makeFlags = lib.optionals enableOfficialBranding [ - "MOZILLA_OFFICIAL=1" - "BUILD_OFFICIAL=1" - ] - ++ lib.optionals ltoSupport [ + makeFlags = lib.optionals ltoSupport [ "AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar" "LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump" "NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm" |