From 11c8d4623cf0ac5e18873f23a49f03321b0a3dcc Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 17 Nov 2023 16:15:53 +0000 Subject: [PATCH 1/2] home: direnv: add 'android' library file --- modules/home/direnv/lib/android.sh | 58 ++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 modules/home/direnv/lib/android.sh diff --git a/modules/home/direnv/lib/android.sh b/modules/home/direnv/lib/android.sh new file mode 100644 index 0000000..b25d675 --- /dev/null +++ b/modules/home/direnv/lib/android.sh @@ -0,0 +1,58 @@ +#shellcheck shell=bash + +# shellcheck disable=2155 +use_android() { + if [ -z "$ANDROID_HOME" ]; then + log_error "use_android: 'ANDROID_HOME' is not defined" + return 1 + fi + + _use_android_find_latest() { + local path="$1" + local version + + version="$(semver_search "$path" "" "")" + if [ -z "$version" ]; then + log_error "use_android: did not find any version at '$path'" + return 1 + fi + + printf '%s' "$version" + } + + # 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)" + + unset -f _use_android_find_latest + + # Allow changing the default version through a command line switch + while true; do + case "$1" in + -b|--build-tools) + build_tools_version="$2" + shift 2 + ;; + -n|--ndk) + ndk_version="$2" + shift 2 + ;; + --) + shift + break + ;; + *) + break + ;; + esac + done + + export ANDROID_SDK_HOME="$ANDROID_HOME" + export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/$ndk_version" + export ANDROID_ROOT="$ANDROID_HOME" + export ANDROID_SDK_ROOT="$ANDROID_SDK_HOME" + export ANDROID_NDK_ROOT="$ANDROID_NDK_HOME" + + PATH_add "$ANDROID_NDK_HOME" + PATH_add "$ANDROID_SDK_HOME/build-tools/$build_tools_version" +} From 00ee4629fc105320ebcd2e82879808fdb3336488 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 17 Nov 2023 16:25:44 +0000 Subject: [PATCH 2/2] hosts: homes: mousqueton: update 'LD_PRELOAD' I was getting dynamic linker errors with the previous value. --- hosts/homes/ambroisie@mousqueton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/homes/ambroisie@mousqueton/default.nix b/hosts/homes/ambroisie@mousqueton/default.nix index 7fcd356..8294ff4 100644 --- a/hosts/homes/ambroisie@mousqueton/default.nix +++ b/hosts/homes/ambroisie@mousqueton/default.nix @@ -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;