From 9c6c4891c726ec0000dac4609c5c5d179baad914 Mon Sep 17 00:00:00 2001 From: xeu Date: Tue, 5 May 2026 20:00:17 +0800 Subject: [PATCH] androidenv.ndk-bundle: use `${package.path}` instead of `ndk/${package.revision}` For NDKs with `-rc*` like `30.0.14904198-rc1`, this avoids dangling symlinks. --- pkgs/development/mobile/androidenv/ndk-bundle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index a9ea5548a199..d0767ddc142b 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -76,8 +76,8 @@ deployAndroidPackage rec { # Ndk now has a prebuilt toolchains inside, the file layout has changed, we do a symlink # to still support the old standalone toolchains builds. - if [ -d $out/libexec/android-sdk/ndk ] && [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then - ln -sf $out/libexec/android-sdk/ndk/${package.revision} $out/libexec/android-sdk/ndk-bundle + if [ -d $out/libexec/android-sdk/${package.path} ] && [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then + ln -sf $out/libexec/android-sdk/${package.path} $out/libexec/android-sdk/ndk-bundle elif [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then echo "The ndk-bundle layout has changed. The nix expressions have to be updated!" exit 1