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

firefox: fix enableOfficialBranding

Browse Source 
(cherry picked from commit 92908738385789d50b9a1f863f977631de41e92b)
This commit is contained in:
Sean Buckley 2021-08-11 20:14:23 -04:00 committed by github-actions[bot]
parent e14fad1ad5
commit 8139ad25a3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,7 +281,10 @@ buildStdenv.mkDerivation ({
'') + '' '') + ''
# AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
unset AS unset AS
''; '' + (lib.optionalString enableOfficialBranding ''
export MOZILLA_OFFICIAL=1
export BUILD_OFFICIAL=1
'');
configureFlags = [ configureFlags = [
"--enable-application=browser" "--enable-application=browser"
@ -333,11 +336,7 @@ buildStdenv.mkDerivation ({
cd obj-* cd obj-*
''; '';
makeFlags = lib.optionals enableOfficialBranding [ makeFlags = lib.optionals ltoSupport [
"MOZILLA_OFFICIAL=1"
"BUILD_OFFICIAL=1"
]
++ lib.optionals ltoSupport [
"AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar" "AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar"
"LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump" "LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump"
"NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm" "NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm"