diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-05 10:55:48 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-05 10:55:48 +0100 |
| commit | d6528a1b7fad8bdcd5f9ff8cc11565e6c4a1747a (patch) | |
| tree | b26e2e4825ed50577a8edf39e649ffa653703724 /pkgs/applications/networking/browsers/chromium | |
| parent | 382303310754e85a61eecbee4e3470abcce441ec (diff) | |
| download | nixlib-d6528a1b7fad8bdcd5f9ff8cc11565e6c4a1747a.tar nixlib-d6528a1b7fad8bdcd5f9ff8cc11565e6c4a1747a.tar.gz nixlib-d6528a1b7fad8bdcd5f9ff8cc11565e6c4a1747a.tar.bz2 nixlib-d6528a1b7fad8bdcd5f9ff8cc11565e6c4a1747a.tar.lz nixlib-d6528a1b7fad8bdcd5f9ff8cc11565e6c4a1747a.tar.xz nixlib-d6528a1b7fad8bdcd5f9ff8cc11565e6c4a1747a.tar.zst nixlib-d6528a1b7fad8bdcd5f9ff8cc11565e6c4a1747a.zip | |
chromium: fixup commit 33557ac
Helps with #17460 @cleverca22 saw calls to SetuidSandboxHost::GetSandboxBinaryPath so we patch this function instead. cc @joachifm
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 4 |
1 files 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/' \ |