From 4b88d42f5125b6b97d4991d0f7efac95f18d90c1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 29 May 2022 07:28:42 +0100 Subject: firefox: disable 'MOZILLA_OFFICIAL=1' on i686 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. --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/networking') diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 06bfddd1d8d92..e82a87c59ece9 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -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 ''; -- cgit 1.4.1