dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #132338 from Ma27/fix-captive-browser-startup

Browse Source 
nixos/captive-browser: fix startup
This commit is contained in:
Linus Heckemann 2021-08-02 20:16:45 +02:00 committed by GitHub
commit 43f5945e9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/captive-browser.nix
View File

@ -27,6 +27,7 @@ in
browser = mkOption { browser = mkOption {
type = types.str; type = types.str;
default = concatStringsSep " " [ default = concatStringsSep " " [
''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"''
''${pkgs.chromium}/bin/chromium'' ''${pkgs.chromium}/bin/chromium''
''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive'' ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive''
''--proxy-server="socks5://$PROXY"'' ''--proxy-server="socks5://$PROXY"''
@ -111,6 +112,7 @@ in
security.wrappers.captive-browser = { security.wrappers.captive-browser = {
capabilities = "cap_net_raw+p"; capabilities = "cap_net_raw+p";
source = pkgs.writeShellScript "captive-browser" '' source = pkgs.writeShellScript "captive-browser" ''
export PREV_CONFIG_HOME="$XDG_CONFIG_HOME"
export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" '' export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" ''
browser = """${cfg.browser}""" browser = """${cfg.browser}"""
dhcp-dns = """${cfg.dhcp-dns}""" dhcp-dns = """${cfg.dhcp-dns}"""