diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-08-01 19:04:49 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-08-02 18:22:00 +0000 |
| commit | 985d2d0dec0a2041fa22ef38fb4f01e36ed7946a (patch) | |
| tree | 7e79e5ad7cb357df8c24d748eabc8687ce8c418d | |
| parent | Merge pull request #132432 from NixOS/backport-132431-to-release-21.05 (diff) | |
| download | nixpkgs-985d2d0dec0a2041fa22ef38fb4f01e36ed7946a.tar.gz | |
nixos/captive-browser: fix startup
It seems as since Chromium 92, `chromium` crashes on startup if
`XDG_CONFIG_HOME` points to a read-only (store-)path.
(cherry picked from commit 8c35a69a6ea206204ddfd3116c4497020b9f2724)
| -rw-r--r-- | nixos/modules/programs/captive-browser.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index 1f223e2475ce..007b0369ec10 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -27,6 +27,7 @@ in browser = mkOption { type = types.str; default = concatStringsSep " " [ + ''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"'' ''${pkgs.chromium}/bin/chromium'' ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive'' ''--proxy-server="socks5://$PROXY"'' @@ -111,6 +112,7 @@ in security.wrappers.captive-browser = { capabilities = "cap_net_raw+p"; source = pkgs.writeShellScript "captive-browser" '' + export PREV_CONFIG_HOME="$XDG_CONFIG_HOME" export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" '' browser = """${cfg.browser}""" dhcp-dns = """${cfg.dhcp-dns}""" |