diff options
| author | Graham Christensen <graham@grahamc.com> | 2019-11-01 08:16:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-01 08:16:27 +0100 |
| commit | 30b10641e13e10968dc625e75b070b21e50c0016 (patch) | |
| tree | 9450e72772cd76994efa257aa9b9e190b4abd711 /pkgs/applications/networking | |
| parent | d1ee1bd06ad8242cb62540de3b24e06fee546bee (diff) | |
| parent | b4f5dc2fb8763b959d2b3452be192d24a52ba1b4 (diff) | |
| download | nixlib-30b10641e13e10968dc625e75b070b21e50c0016.tar nixlib-30b10641e13e10968dc625e75b070b21e50c0016.tar.gz nixlib-30b10641e13e10968dc625e75b070b21e50c0016.tar.bz2 nixlib-30b10641e13e10968dc625e75b070b21e50c0016.tar.lz nixlib-30b10641e13e10968dc625e75b070b21e50c0016.tar.xz nixlib-30b10641e13e10968dc625e75b070b21e50c0016.tar.zst nixlib-30b10641e13e10968dc625e75b070b21e50c0016.zip | |
Merge pull request #72343 from ivan/chromium-fix-startup
chromium: do not load .so files from current working directory
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 8a3ae2a06a74..8329bf3ef550 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -156,7 +156,11 @@ in stdenv.mkDerivation { export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}" fi - export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:${libPath}" + '' + lib.optionalString (libPath != "") '' + # To avoid loading .so files from cwd, LD_LIBRARY_PATH here must not + # contain an empty section before or after a colon. + export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${libPath}" + '' + '' # libredirect causes chromium to deadlock on startup export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" |