MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

firefox: disable 'MOZILLA_OFFICIAL=1' on i686

Browse source 
Without the change firefox build on i686 fails at configure time:

    $ NIXPKGS_ALLOW_BROKEN=1 nix build -f. --argstr system "i686-linux" firefox
    ...
    mozbuild.configure.options.InvalidOptionError:
      '--enable-release' implied by 'MOZILLA_OFFICIAL' conflicts with '--disable-release' from the command-line

The change uses the same 32-bit guard for both. It still does not allow
i686 build to succeed for other toolchain misconfiguration, but it's a
step forward.
This commit is contained in:
Sergei Trofimovich 2022-05-29 07:28:42 +01:00 committed by ehmry
parent 81008f02c4
commit 4b88d42f51
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -328,7 +328,7 @@ buildStdenv.mkDerivation ({
# please get your own set of keys at https://location.services.mozilla.com/api.
echo "dfd7836c-d458-4917-98bb-421c82d3c8a0" > $TMPDIR/mls-api-key
configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key")
'' + lib.optionalString enableOfficialBranding ''
'' + lib.optionalString (enableOfficialBranding && !stdenv.is32bit) ''
export MOZILLA_OFFICIAL=1
'';