swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-30 17:10:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #173235 from squalus/librewolf-fix

Browse source
This commit is contained in:
Martin Weinelt 2022-05-16 22:56:32 +02:00 committed by GitHub
parent f150888da6 4a1f7f8472
commit 8a267013a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -171,8 +171,8 @@ buildStdenv.mkDerivation ({
outputs = [
"out"
"symbols"
];
]
++ lib.optionals crashreporterSupport [ "symbols" ];
# Add another configure-build-profiling run before the final configure phase if we build with pgo
preConfigurePhases = lib.optionals pgoSupport [
@ -202,7 +202,6 @@ buildStdenv.mkDerivation ({
nativeBuildInputs = [
autoconf
cargo
dump_syms
llvmPackages.llvm # llvm-objdump
makeWrapper
nodejs
@ -216,6 +215,7 @@ buildStdenv.mkDerivation ({
which
wrapGAppsHook
]
++ lib.optionals crashreporterSupport [ dump_syms ]
++ lib.optionals pgoSupport [ xvfb-run ]
++ extraNativeBuildInputs;
@ -421,11 +421,11 @@ buildStdenv.mkDerivation ({
# Generate build symbols once after the final build
# https://firefox-source-docs.mozilla.org/crash-reporting/uploading_symbol.html
preInstall = ''
preInstall = lib.optionalString crashreporterSupport ''
./mach buildsymbols
mkdir -p $symbols/
cp mozobj/dist/*.crashreporter-symbols.zip $symbols/
'' + ''
cd mozobj
'';