From 7fddc1a320f0f2d1fe7133ac28aa2a10d6c11e3a Mon Sep 17 00:00:00 2001
From: Alexander Sosedkin <monk@unboiled.info>
Date: Sun, 6 Oct 2019 02:51:49 +0200
Subject: [PATCH] Install proot as proot-static to avoid clashes

---
 src/pkgs/bootstrap.nix | 2 +-
 src/pkgs/proot.nix     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pkgs/bootstrap.nix b/src/pkgs/bootstrap.nix
index c529958..243d0a3 100644
--- a/src/pkgs/bootstrap.nix
+++ b/src/pkgs/bootstrap.nix
@@ -17,7 +17,7 @@ buildPkgs.runCommand "bootstrap" { } ''
   ln --symbolic --no-dereference ${packageInfo.bash}/bin/sh $out/bin/sh
   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-inner}/usr/lib/login-inner $out/usr/lib/login-inner
diff --git a/src/pkgs/proot.nix b/src/pkgs/proot.nix
index 28d08af..3448c20 100644
--- a/src/pkgs/proot.nix
+++ b/src/pkgs/proot.nix
@@ -19,6 +19,6 @@ crossStaticPkgs.stdenv.mkDerivation rec {
   makeFlags = [ "-Csrc CFLAGS=-D__ANDROID__" ];
 
   installPhase = ''
-    install -D -m 0755 src/proot $out/bin/proot
+    install -D -m 0755 src/proot $out/bin/proot-static
   '';
 }