Merge staging-next into staging

2019-08-17 09:39:23 +02:00
parent ed3cb39bfa c68f58d95c
commit fe9a3e3e63
174 changed files with 4833 additions and 1993 deletions
@@ -300,7 +300,8 @@ stdenv.mkDerivation rec {

    # Clear out some files that tend to capture store references but are
    # easily generated by firefox at startup.
-    rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json}
+    rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{addonStartup.json.lz4,compatibility.ini,extensions.ini,extensions.json}
+    rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/startupCache/*

    # XDG
    : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}"