From d6528a1b7fad8bdcd5f9ff8cc11565e6c4a1747a Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 5 Aug 2016 10:55:48 +0100 Subject: [PATCH] chromium: fixup commit 33557ac Helps with #17460 @cleverca22 saw calls to SetuidSandboxHost::GetSandboxBinaryPath so we patch this function instead. cc @joachifm --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 46734e3ab072..2c70978a4962 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -137,8 +137,8 @@ let # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ --replace \ - 'std::string sandbox_binary(GetSandboxBinaryPath().value());' \ - 'std::string sandbox_binary(GetDevelSandboxPath());' + 'return sandbox_binary;' \ + 'return base::FilePath(GetDevelSandboxPath());' sed -i -r \ -e 's/-f(stack-protector)(-all)?/-fno-\1/' \