swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

firefox: fix indentation

Browse source
This commit is contained in:
Yureka 2023-04-26 15:18:38 +02:00
parent bad5e4f489
commit 7a32a141db
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -307,37 +307,37 @@ buildStdenv.mkDerivation ({
# RBox WASM Sandboxing # RBox WASM Sandboxing
export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc
export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++ export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++
'' + lib.optionalString pgoSupport '' '' + lib.optionalString pgoSupport ''
if [ -e "$TMPDIR/merged.profdata" ]; then if [ -e "$TMPDIR/merged.profdata" ]; then
echo "Configuring with profiling data" echo "Configuring with profiling data"
for i in "''${!configureFlagsArray[@]}"; do for i in "''${!configureFlagsArray[@]}"; do
if [[ ''${configureFlagsArray[i]} = "--enable-profile-generate=cross" ]]; then if [[ ''${configureFlagsArray[i]} = "--enable-profile-generate=cross" ]]; then
unset 'configureFlagsArray[i]' unset 'configureFlagsArray[i]'
fi fi
done done
configureFlagsArray+=( configureFlagsArray+=(
"--enable-profile-use=cross" "--enable-profile-use=cross"
"--with-pgo-profile-path="$TMPDIR/merged.profdata"" "--with-pgo-profile-path="$TMPDIR/merged.profdata""
"--with-pgo-jarlog="$TMPDIR/jarlog"" "--with-pgo-jarlog="$TMPDIR/jarlog""
) )
${lib.optionalString stdenv.hostPlatform.isMusl '' ${lib.optionalString stdenv.hostPlatform.isMusl ''
LDFLAGS="$OLD_LDFLAGS" LDFLAGS="$OLD_LDFLAGS"
unset OLD_LDFLAGS unset OLD_LDFLAGS
''} ''}
else else
echo "Configuring to generate profiling data" echo "Configuring to generate profiling data"
configureFlagsArray+=( configureFlagsArray+=(
"--enable-profile-generate=cross" "--enable-profile-generate=cross"
) )
${lib.optionalString stdenv.hostPlatform.isMusl ${lib.optionalString stdenv.hostPlatform.isMusl
# Set the rpath appropriately for the profiling run # Set the rpath appropriately for the profiling run
# During the profiling run, loading libraries from $out would fail, # During the profiling run, loading libraries from $out would fail,
# since the profiling build has not been installed to $out # since the profiling build has not been installed to $out
'' ''
OLD_LDFLAGS="$LDFLAGS" OLD_LDFLAGS="$LDFLAGS"
LDFLAGS="-Wl,-rpath,$(pwd)/mozobj/dist/${binaryName}" LDFLAGS="-Wl,-rpath,$(pwd)/mozobj/dist/${binaryName}"
''} ''}
fi fi
'' + lib.optionalString googleAPISupport '' '' + lib.optionalString googleAPISupport ''
# Google API key used by Chromium and Firefox. # Google API key used by Chromium and Firefox.
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,