From 72b7e5491b1575b12dc3f3deb2d536d2cd0e1f56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 28 Jan 2024 03:01:45 +0100 Subject: [PATCH] buildMozillaMach: fix pgo configure flags This broke when support for opt-in __structuredAttrs was added in 238a6053. Fixes: #283563 --- pkgs/applications/networking/browsers/firefox/common.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 4396d7e85d41..1c95b667a4e7 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -320,11 +320,9 @@ buildStdenv.mkDerivation { unset 'configureFlagsArray[i]' fi done - configureFlagsArray+=( - "--enable-profile-use=cross" - "--with-pgo-profile-path="$TMPDIR/merged.profdata"" - "--with-pgo-jarlog="$TMPDIR/jarlog"" - ) + appendToVar configureFlags --enable-profile-use=cross + appendToVar configureFlags --with-pgo-profile-path=$TMPDIR/merged.profdata + appendToVar configureFlags --with-pgo-jarlog=$TMPDIR/jarlog ${lib.optionalString stdenv.hostPlatform.isMusl '' LDFLAGS="$OLD_LDFLAGS" unset OLD_LDFLAGS