summary refs log tree commit diff
path: root/pkgs/development/mobile/androidenv/emulator.nix
diff options
context:
space:
mode:
authorHadi <hadilashkari@gmail.com>2022-12-27 18:26:10 -0500
committerHadi <hadilashkari@gmail.com>2023-01-27 18:15:47 -0500
commit9c4e43ab70c506875684619f30d6d16f093e87d5 (patch)
tree0d19d3528ec482feab2580fc032e03becd8851d1 /pkgs/development/mobile/androidenv/emulator.nix
parent293421378efae3ec34cf7a7dce3e80bd4fc11159 (diff)
downloadnixpkgs-9c4e43ab70c506875684619f30d6d16f093e87d5.tar
nixpkgs-9c4e43ab70c506875684619f30d6d16f093e87d5.tar.gz
nixpkgs-9c4e43ab70c506875684619f30d6d16f093e87d5.tar.bz2
nixpkgs-9c4e43ab70c506875684619f30d6d16f093e87d5.tar.lz
nixpkgs-9c4e43ab70c506875684619f30d6d16f093e87d5.tar.xz
nixpkgs-9c4e43ab70c506875684619f30d6d16f093e87d5.tar.zst
nixpkgs-9c4e43ab70c506875684619f30d6d16f093e87d5.zip
androidenv: Implement cmdline-tools and patcher
- Replace cmdline-tools with tools because tools is obsolete now.
- Depend emulator package to systemImages

androidenv: fix issues on the PR

androidenv: reformat

androidenv: support excluding of `tools` package

androidenv: provide `tools`, and `build-tools`, dependencies

androidenv: replace includeTools with toolsVersion

androidenv: fix a typo

androidenv: add tests to check licenses and installed packages

androidenv: check if tests are running! this commit should fail!

androidenv: fix problems in the review https://github.com/NixOS/nixpkgs/pull/208793

androidenv: add test-suite to handle more tests around

androidenv: fix the test after couldn't running them with ofborg

Update pkgs/development/mobile/androidenv/build-tools.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

androidenv: Resolving https://github.com/NixOS/nixpkgs/pull/208793#discussion_r1065851539

Update pkgs/development/mobile/androidenv/cmdline-tools.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Update pkgs/development/mobile/androidenv/tools.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

androidenv: fix a typo
Diffstat (limited to 'pkgs/development/mobile/androidenv/emulator.nix')
-rw-r--r--pkgs/development/mobile/androidenv/emulator.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix
index 0a680fd360f..273cc3d8a8a 100644
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@@ -1,4 +1,4 @@
-{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux }:
+{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall }:
 
 deployAndroidPackage {
   inherit package os;
@@ -47,6 +47,15 @@ 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
+      ln -s $i
+    done
+
+    cd $out/libexec/android-sdk
+    ${postInstall}
   '';
   dontMoveLib64 = true;
 }