diff --git a/modules/build/config.nix b/modules/build/config.nix index ea971ee..99ac52b 100644 --- a/modules/build/config.nix +++ b/modules/build/config.nix @@ -43,7 +43,7 @@ with lib; config = { - build.installationDir = "/data/data/com.termux.nix/files/usr"; + build.installationDir = "/data/data/com.termux/files/usr"; }; diff --git a/modules/user.nix b/modules/user.nix index 6ed9f91..fba72dd 100644 --- a/modules/user.nix +++ b/modules/user.nix @@ -91,7 +91,7 @@ in user = { group = "nix-on-droid"; - home = "/data/data/com.termux.nix/files/home"; + home = "/data/data/com.termux/files/home"; userName = "nix-on-droid"; }; diff --git a/pkgs/bootstrap-zip.nix b/pkgs/bootstrap-zip.nix index a16ec3e..75bd1b9 100644 --- a/pkgs/bootstrap-zip.nix +++ b/pkgs/bootstrap-zip.nix @@ -1,6 +1,6 @@ # Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE. -{ lib, runCommand, zip, bootstrap, targetSystem }: +{ lib, runCommand, gnutar, bootstrap, targetSystem }: let arch = lib.strings.removeSuffix "-linux" targetSystem; @@ -8,5 +8,5 @@ in runCommand "bootstrap-zip" { } '' mkdir $out cd ${bootstrap} - ${zip}/bin/zip -q -9 -r $out/bootstrap-${arch} ./* ./.l2s + ${gnutar}/bin/tar czf $out/bootstrap-${arch}.tar.gz ./* ./.l2s '' diff --git a/pkgs/bootstrap.nix b/pkgs/bootstrap.nix index 74c47fa..6f79b93 100644 --- a/pkgs/bootstrap.nix +++ b/pkgs/bootstrap.nix @@ -22,13 +22,4 @@ runCommand "bootstrap" { } '' cp --dereference --recursive $out/etc/static $out/etc/.static.tmp rm $out/etc/static mv $out/etc/.static.tmp $out/etc/static - - find $out -executable -type f | sed s@^$out/@@ > $out/EXECUTABLES.txt - - find $out -type l | while read -r LINK; do - LNK=''${LINK#$out/} - TGT=$(readlink "$LINK") - echo "$TGT←$LNK" >> $out/SYMLINKS.txt - rm "$LINK" - done ''