Skip to content

Commit

Permalink
Merge pull request #134945 from primeos/google-chrome-dev
Browse files Browse the repository at this point in the history
google-chrome-dev: Fix the build
  • Loading branch information
primeos authored Aug 20, 2021
2 parents db079ab + 88336ee commit d212eb4
Showing 1 changed file with 5 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d212eb4

Please sign in to comment.