From f81ada79e38a834bb068d9eb571663239e03903c Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 27 Mar 2025 01:31:52 -0700
Subject: [PATCH] androidenv: emulator: support 35.5.x

---
 pkgs/development/mobile/androidenv/emulator.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix
index e513b7df1b0d..e2f724ada13c 100644
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@@ -36,6 +36,8 @@ deployAndroidPackage {
         nss
         nspr
         alsa-lib
+        llvmPackages_15.libllvm.lib
+        waylandpp.lib
       ]
     )
     ++ (with pkgs.xorg; [
@@ -52,6 +54,7 @@ deployAndroidPackage {
       libICE
       libSM
       libxkbfile
+      libxshmfence
     ])
     ++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc;
   patchInstructions = lib.optionalString (os == "linux") ''
@@ -66,6 +69,10 @@ deployAndroidPackage {
       patchelf --replace-needed libtiff.so.5 libtiff.so "$file" || true
     done
 
+    for file in $out/libexec/android-sdk/emulator/lib64/vulkan/libvulkan_lvp.so; do
+      patchelf --replace-needed libLLVM-15.so.1 libLLVM-15.so "$file" || true
+    done
+
     autoPatchelf $out
 
     # Wrap emulator so that it can load required libraries at runtime