make sure it's still working on android

This commit is contained in:
William Casarin
2023-07-09 12:17:54 -07:00
parent 6232a8429e
commit 2526f8001c
5 changed files with 26 additions and 18 deletions

View File

@@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> {} }:
{ pkgs ? import <nixpkgs> {}, use_android ? true }:
with pkgs;
let
x11libs = lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi libglvnd vulkan-loader vulkan-validation-layers ];
@@ -16,10 +16,9 @@ let
androidsdk = androidComposition.androidsdk;
android-home = "${androidsdk}/libexec/android-sdk";
ndk-home = "${android-home}/ndk/${ndk-version}";
use_android = true;
in
mkShell {
mkShell ({
nativeBuildInputs = [
cargo-udeps cargo-edit cargo-watch rustup rustfmt libiconv pkgconfig cmake fontconfig
brotli wabt
@@ -32,4 +31,4 @@ mkShell {
} // (if !use_android then {} else {
ANDROID_HOME = android-home;
NDK_HOME = ndk-home;
})
}))