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

Changed: Export correct PATH and also export LD_LIBRARY_PATH for Android 5/6 since packages won't use DT_RUNPATH

Browse source
This commit is contained in:
agnostic-apollo 2022-04-26 02:35:43 +05:00
parent c549988434
commit 4e08f76fd2
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
View file

@ -1,9 +1,11 @@
package com.termux.shared.termux.shell; package com.termux.shared.termux.shell;
import android.content.Context; import android.content.Context;
import android.os.Build;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import com.termux.shared.BuildConfig;
import com.termux.shared.errors.Error; import com.termux.shared.errors.Error;
import com.termux.shared.file.filesystem.FileTypes; import com.termux.shared.file.filesystem.FileTypes;
import com.termux.shared.termux.TermuxBootstrap; import com.termux.shared.termux.TermuxBootstrap;
@ -95,9 +97,14 @@ public class TermuxShellUtils {
environment.add("PATH= " + System.getenv("PATH")); environment.add("PATH= " + System.getenv("PATH"));
} else { } else {
environment.add("LANG=en_US.UTF-8"); environment.add("LANG=en_US.UTF-8");
environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH);
environment.add("PWD=" + workingDirectory); environment.add("PWD=" + workingDirectory);
environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH); environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + ":" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/applets");
environment.add("LD_LIBRARY_PATH=" + TermuxConstants.TERMUX_LIB_PREFIX_DIR_PATH);
} else {
environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH);
}
} }
return environment.toArray(new String[0]); return environment.toArray(new String[0]);