Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c5aabb0d603e
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 70f69e362995
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 31, 2019

  1. chromium: do not load .so files from current working directory 

    Fixes #67234.

(cherry picked from commit b4f5dc2)
    @ivan
    ivan committed Oct 31, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 76AA3F9F2BD3E3A0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5b879b2 View commit details

Commits on Nov 1, 2019

  1. Merge pull request #72344 from ivan/chromium-fix-startup-19.09 

    [19.09] chromium: do not load .so files from current working directory
    @grahamc
    grahamc authored Nov 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 76AA3F9F2BD3E3A0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    70f69e3 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 pkgs/applications/networking/browsers/chromium/default.nix
6 changes: 5 additions & 1 deletion pkgs/applications/networking/browsers/chromium/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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' ':')"