diff --git a/build.sh b/build.sh index 36cfb9d..1d597e0 100755 --- a/build.sh +++ b/build.sh @@ -11,10 +11,6 @@ nixOnDroidChannelURL=https://github.com/$repo/archive/$branch.tar.gz mkdir -p out rm -f out/* for arch in $arches; do - echo $arch: building talloc... - nix build --show-trace -f pkgs --argstr arch $arch tallocStatic -o out/talloc-$arch - talloc=$(realpath out/talloc-$arch) - echo $arch: building proot... nix build --show-trace -f pkgs --argstr arch $arch prootTermux -o out/proot-$arch proot=$(realpath out/proot-$arch) @@ -27,17 +23,15 @@ for arch in $arches; do echo $arch: building nix-on-droid... nix build --show-trace -f pkgs --argstr arch $arch --argstr nixOnDroidChannelURL $nixOnDroidChannelURL bootstrapZip -o out/nix-on-droid-$arch - echo $arch: injecting talloc/proot for initial bootstrap... + echo $arch: injecting proot for initial bootstrap... cat out/nix-on-droid-$arch/bootstrap-$arch.zip > out/bootstrap-$arch.zip - nix-store --export --readonly-mode $talloc > out/talloc-$arch.closure - nix-store --export --readonly-mode $proot > out/proot-$arch.closure + nix-store --export --readonly-mode $(nix-store -qR $proot) > out/proot-$arch.closure mkdir out/repack-$arch pushd out/repack-$arch >/dev/null unzip -q ../bootstrap-$arch.zip rm ../bootstrap-$arch.zip - cp ../talloc-$arch.closure ./talloc.closure cp ../proot-$arch.closure ./proot.closure zip --quiet -r ../bootstrap-$arch.zip . popd >/dev/null diff --git a/modules/environment/login/login-inner.nix b/modules/environment/login/login-inner.nix index 383117a..19dd164 100644 --- a/modules/environment/login/login-inner.nix +++ b/modules/environment/login/login-inner.nix @@ -33,14 +33,9 @@ writeText "login-inner" '' export NIX_SSL_CERT_FILE=${cacert} if [ -r ${config.build.installationDir}/proot.closure ]; then - echo "Injecting bundled talloc closure..." - ${nix}/bin/nix-store --import < ${config.build.installationDir}/talloc.closure - ${coreutils}/bin/rm -f ${config.build.installationDir}/talloc.closure echo "Injecting bundled proot closure..." ${nix}/bin/nix-store --import < ${config.build.installationDir}/proot.closure ${coreutils}/bin/rm -f ${config.build.installationDir}/proot.closure - else - echo "No bundled talloc/proot closures found, which is OK for official builds..." fi echo "Installing and updating nix-channels..."