diff options
| author | Linus Heckemann <git@sphalerite.org> | 2021-08-02 20:16:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 20:16:45 +0200 |
| commit | 43f5945e9fbbd7ef2c04ef1358cc2c8aa339e08a (patch) | |
| tree | 78fc319791eb8a71bcb6b0c47874ea69eb0e2b50 | |
| parent | 2adaddd1d3520257a6c26e464960c08bc0c67a29 (diff) | |
| parent | 8c35a69a6ea206204ddfd3116c4497020b9f2724 (diff) | |
| download | nixpkgs-43f5945e9fbbd7ef2c04ef1358cc2c8aa339e08a.tar nixpkgs-43f5945e9fbbd7ef2c04ef1358cc2c8aa339e08a.tar.gz nixpkgs-43f5945e9fbbd7ef2c04ef1358cc2c8aa339e08a.tar.bz2 nixpkgs-43f5945e9fbbd7ef2c04ef1358cc2c8aa339e08a.tar.lz nixpkgs-43f5945e9fbbd7ef2c04ef1358cc2c8aa339e08a.tar.xz nixpkgs-43f5945e9fbbd7ef2c04ef1358cc2c8aa339e08a.tar.zst nixpkgs-43f5945e9fbbd7ef2c04ef1358cc2c8aa339e08a.zip | |
Merge pull request #132338 from Ma27/fix-captive-browser-startup
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 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}""" |