nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-12-16 14:01:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bundle talloc closure along with proot

Browse source
This commit is contained in:
Alexander Sosedkin 2019-12-30 22:44:55 +01:00
parent c4e71dd000
commit b937531d13
2 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
build.sh
View file

@ -11,10 +11,6 @@ nixOnDroidChannelURL=https://github.com/$repo/archive/$branch.tar.gz
mkdir -p out mkdir -p out
rm -f out/* rm -f out/*
for arch in $arches; do 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... echo $arch: building proot...
nix build --show-trace -f pkgs --argstr arch $arch prootTermux -o out/proot-$arch nix build --show-trace -f pkgs --argstr arch $arch prootTermux -o out/proot-$arch
proot=$(realpath out/proot-$arch) proot=$(realpath out/proot-$arch)
@ -27,17 +23,15 @@ for arch in $arches; do
echo $arch: building nix-on-droid... 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 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 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 $(nix-store -qR $proot) > out/proot-$arch.closure
nix-store --export --readonly-mode $proot > out/proot-$arch.closure
mkdir out/repack-$arch mkdir out/repack-$arch
pushd out/repack-$arch >/dev/null pushd out/repack-$arch >/dev/null
unzip -q ../bootstrap-$arch.zip unzip -q ../bootstrap-$arch.zip
rm ../bootstrap-$arch.zip rm ../bootstrap-$arch.zip
cp ../talloc-$arch.closure ./talloc.closure
cp ../proot-$arch.closure ./proot.closure cp ../proot-$arch.closure ./proot.closure
zip --quiet -r ../bootstrap-$arch.zip . zip --quiet -r ../bootstrap-$arch.zip .
popd >/dev/null popd >/dev/null

5
modules/environment/login/login-inner.nix
View file

@ -33,14 +33,9 @@ writeText "login-inner" ''
export NIX_SSL_CERT_FILE=${cacert} export NIX_SSL_CERT_FILE=${cacert}
if [ -r ${config.build.installationDir}/proot.closure ]; then 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..." echo "Injecting bundled proot closure..."
${nix}/bin/nix-store --import < ${config.build.installationDir}/proot.closure ${nix}/bin/nix-store --import < ${config.build.installationDir}/proot.closure
${coreutils}/bin/rm -f ${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 fi
echo "Installing and updating nix-channels..." echo "Installing and updating nix-channels..."