Compare commits
2 commits
289a58c855
...
00ee4629fc
| Author | SHA1 | Date | |
|---|---|---|---|
| 00ee4629fc | |||
| 11c8d4623c |
2 changed files with 6 additions and 6 deletions
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
# Some tooling (e.g: SSH) need to use this library
|
||||
home.sessionVariables = {
|
||||
LD_PRELOAD = "/lib/x86_64-linux-gnu/libnss_cache.so.2\${LD_PRELOAD:+:}$LD_PRELOAD";
|
||||
LD_PRELOAD = "/usr/grte/v5/lib64/libnss_cache.so.2\${LD_PRELOAD:+:}$LD_PRELOAD";
|
||||
};
|
||||
|
||||
systemd.user.sessionVariables = {
|
||||
LD_PRELOAD = "/lib/x86_64-linux-gnu/libnss_cache.so.2\${LD_PRELOAD:+:}$LD_PRELOAD";
|
||||
LD_PRELOAD = "/usr/grte/v5/lib64/libnss_cache.so.2\${LD_PRELOAD:+:}$LD_PRELOAD";
|
||||
};
|
||||
|
||||
programs.git.package = lib.mkForce pkgs.emptyDirectory;
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ use_android() {
|
|||
fi
|
||||
|
||||
_use_android_find_latest() {
|
||||
local path=$1
|
||||
local path="$1"
|
||||
local version
|
||||
|
||||
version=$(semver_search "$path" "" "")
|
||||
version="$(semver_search "$path" "" "")"
|
||||
if [ -z "$version" ]; then
|
||||
log_error "use_android: did not find any version at '$path'"
|
||||
return 1
|
||||
|
|
@ -21,8 +21,8 @@ use_android() {
|
|||
}
|
||||
|
||||
# Default to the latest version found
|
||||
local ndk_version=$(_use_android_find_latest "$ANDROID_HOME/ndk" || return 1)
|
||||
local build_tools_version=$(_use_android_find_latest "$ANDROID_SDK_HOME/build-tools" || return 1)
|
||||
local ndk_version="$(_use_android_find_latest "$ANDROID_HOME/ndk" || return 1)"
|
||||
local build_tools_version="$(_use_android_find_latest "$ANDROID_SDK_HOME/build-tools" || return 1)"
|
||||
|
||||
unset -f _use_android_find_latest
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue