From 284bf4fd54e4757f192ff89d0784d5045f442b5f Mon Sep 17 00:00:00 2001 From: Steffen Beyer Date: Sat, 31 May 2025 16:26:34 +0200 Subject: [PATCH] androidenv: emulator: fix non-Linux path/binary symlink --- pkgs/development/mobile/androidenv/emulator.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index e2f724ada13c..473a9d1d1c06 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -57,7 +57,7 @@ deployAndroidPackage { libxshmfence ]) ++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc; - patchInstructions = lib.optionalString (os == "linux") '' + patchInstructions = (lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib addAutoPatchelfSearchPath $packageBaseDir/lib64 addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib @@ -85,7 +85,8 @@ deployAndroidPackage { } \ --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale - + '') + + '' mkdir -p $out/bin cd $out/bin find $out/libexec/android-sdk/emulator -type f -executable -mindepth 1 -maxdepth 1 | while read i; do