summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2021-08-01 19:04:49 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2021-08-01 19:04:49 +0200
commit8c35a69a6ea206204ddfd3116c4497020b9f2724 (patch)
tree56b2003a21c7f7545819084754cdaa20a2ee49ec
parent3669b12f35aa4cce673191e061349e70bb3d4ddd (diff)
downloadnixpkgs-8c35a69a6ea206204ddfd3116c4497020b9f2724.tar
nixpkgs-8c35a69a6ea206204ddfd3116c4497020b9f2724.tar.gz
nixpkgs-8c35a69a6ea206204ddfd3116c4497020b9f2724.tar.bz2
nixpkgs-8c35a69a6ea206204ddfd3116c4497020b9f2724.tar.lz
nixpkgs-8c35a69a6ea206204ddfd3116c4497020b9f2724.tar.xz
nixpkgs-8c35a69a6ea206204ddfd3116c4497020b9f2724.tar.zst
nixpkgs-8c35a69a6ea206204ddfd3116c4497020b9f2724.zip
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.
-rw-r--r--nixos/modules/programs/captive-browser.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix
index 1f223e2475c..007b0369ec1 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}"""