diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-08-02 22:19:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 22:19:56 +0200 |
| commit | bbd7696843ae80fb2aa8b8e32cb322e8fc30fcf5 (patch) | |
| tree | a1a5041c2b675e2b93f118b309c568f6d6dabb3b | |
| parent | Merge pull request #132441 from Ma27/backport-captive-browser (diff) | |
| parent | nixos/captive-browser: fix startup (diff) | |
| download | nixpkgs-bbd7696843ae80fb2aa8b8e32cb322e8fc30fcf5.tar.gz | |
Merge pull request #132440 from NixOS/backport-132338-to-release-21.05
[Backport release-21.05] nixos/captive-browser: fix startup
| -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}""" |