nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #200165 from NixOS/backport-200102-to-release-22.05

Browse Source
This commit is contained in:
Martin Weinelt
2022-11-08 09:38:08 +01:00
committed by GitHub
parent 4686b37b67 89af1062fe
commit 67bcb74195
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/browsers/firefox/common.nix
View File

@@ -22,6 +22,7 @@
, pkgs
, stdenv
, fetchpatch
, patchelf
# build time
, autoconf
@@ -99,7 +100,7 @@
# WARNING: NEVER set any of the options below to `true` by default.
# Set to `!privacySupport` or `false`.
, crashreporterSupport ? !privacySupport
, crashreporterSupport ? !privacySupport, curl
, geolocationSupport ? !privacySupport
, googleAPISupport ? geolocationSupport
, mlsAPISupport ? geolocationSupport
@@ -264,7 +265,7 @@ buildStdenv.mkDerivation ({
which
wrapGAppsHook
]
++ lib.optionals crashreporterSupport [ dump_syms ]
++ lib.optionals crashreporterSupport [ dump_syms patchelf ]
++ lib.optionals pgoSupport [ xvfb-run ]
++ extraNativeBuildInputs;
@@ -539,6 +540,10 @@ buildStdenv.mkDerivation ({
}
'';
postFixup = lib.optionalString crashreporterSupport ''
patchelf --add-rpath "${lib.makeLibraryPath [ curl ]}" $out/lib/${binaryName}/crashreporter
'';
doInstallCheck = true;
installCheckPhase = ''
# Some basic testing