nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Install proot as proot-static to avoid clashes

Browse source
This commit is contained in:
Alexander Sosedkin 2019-10-06 02:51:49 +02:00
parent 46b782165a
commit 7fddc1a320
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pkgs/bootstrap.nix
View file

@ -17,7 +17,7 @@ buildPkgs.runCommand "bootstrap" { } ''
ln --symbolic --no-dereference ${packageInfo.bash}/bin/sh $out/bin/sh ln --symbolic --no-dereference ${packageInfo.bash}/bin/sh $out/bin/sh
ln --symbolic --no-dereference ${packageInfo.coreutils}/bin/env $out/usr/bin/env ln --symbolic --no-dereference ${packageInfo.coreutils}/bin/env $out/usr/bin/env
install -D -m 0755 ${proot}/bin/proot $out/bin/proot install -D -m 0755 ${proot}/bin/proot-static $out/bin/proot-static
cp ${files.login}/bin/login $out/bin/login cp ${files.login}/bin/login $out/bin/login
cp ${files.login-inner}/usr/lib/login-inner $out/usr/lib/login-inner cp ${files.login-inner}/usr/lib/login-inner $out/usr/lib/login-inner

2
src/pkgs/proot.nix
View file

@ -19,6 +19,6 @@ crossStaticPkgs.stdenv.mkDerivation rec {
makeFlags = [ "-Csrc CFLAGS=-D__ANDROID__" ]; makeFlags = [ "-Csrc CFLAGS=-D__ANDROID__" ];
installPhase = '' installPhase = ''
install -D -m 0755 src/proot $out/bin/proot install -D -m 0755 src/proot $out/bin/proot-static
''; '';
} }