From 9e0211b13cacbbec91f22fc6761601b12dd0ba30 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 20 Aug 2021 13:48:07 +0200 Subject: [PATCH] google-chrome-dev: Fix the build crashpad_handler was renamed to chrome_crashpad_handler. (cherry picked from commit 88336eea953611be8e7da63661000ec7eb9f6032) --- .../networking/browsers/google-chrome/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 61d304becfd..34cc5bb9160 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -75,6 +75,10 @@ let suffix = if channel != "stable" then "-" + channel else ""; + crashpadHandlerBinary = if lib.versionAtLeast version "94" + then "chrome_crashpad_handler" + else "crashpad_handler"; + in stdenv.mkDerivation { inherit version; @@ -146,7 +150,7 @@ in stdenv.mkDerivation { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --add-flags ${escapeShellArg commandLineArgs} - for elf in $out/share/google/$appname/{chrome,chrome-sandbox,crashpad_handler,nacl_helper}; do + for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do patchelf --set-rpath $rpath $elf patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf done