From 08a263882dc104acba8ff0d6c3e0e3d6982e77ca Mon Sep 17 00:00:00 2001 From: Slendi Date: Tue, 16 Sep 2025 16:59:34 +0300 Subject: [PATCH] a Signed-off-by: Slendi --- flake.nix | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index 3fc20ab..8ae5afd 100644 --- a/flake.nix +++ b/flake.nix @@ -124,7 +124,6 @@ [ -x "$PROOT_BIN" ] || { echo "proot not found/executable: $PROOT_BIN" >&2; exit 127; } [ -x "$EXTRACT_DIR''${APP_REL}" ] || { echo "app not found/executable: $EXTRACT_DIR''${APP_REL}" >&2; exit 127; } - # DNS for Android/termux (no /etc/resolv.conf in root) mkdir -p "$EXTRACT_DIR/etc" cat > "$EXTRACT_DIR/etc/resolv.conf" <<'EOF' nameserver 9.9.9.9 @@ -133,24 +132,14 @@ nameserver 1.0.0.1 EOF - # run proot (no exec so trap can clean). Set BUNDLE_EXEC=1 to exec instead. - if [ "''${BUNDLE_EXEC:-0}" = 1 ]; then - exec "''${PROOT_BIN}" \ - -R / \ - -b "$EXTRACT_DIR/nix:/nix" \ - -b "$EXTRACT_DIR/etc/resolv.conf:/etc/resolv.conf" \ - -b /dev -b /proc -b /sys \ - -w "$BUNDLE_PWD" \ - "$EXTRACT_DIR''${APP_REL}" "$@" - else - "''${PROOT_BIN}" \ - -R / \ - -b "$EXTRACT_DIR/nix:/nix" \ - -b "$EXTRACT_DIR/etc/resolv.conf:/etc/resolv.conf" \ - -b /dev -b /proc -b /sys \ - -w "$BUNDLE_PWD" \ - "$EXTRACT_DIR''${APP_REL}" "$@" - fi + "''${PROOT_BIN}" \ + -R / \ + -b "$EXTRACT_DIR/nix:/nix" \ + -b "$EXTRACT_DIR/etc/resolv.conf:/etc/resolv.conf" \ + -b /dev -b /proc -b /sys \ + -w "$BUNDLE_PWD" \ + "$EXTRACT_DIR''${APP_REL}" "$@" + exit $? __ARCHIVE_BELOW__ SH