tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix: use_android flag

Browse Source
This commit is contained in:
William Casarin
2023-07-06 19:36:01 -07:00
parent 80c06e4ec4
commit 6d0aa0e09c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
shell.nix
View File

@@ -16,6 +16,7 @@ let
androidsdk = androidComposition.androidsdk; androidsdk = androidComposition.androidsdk;
android-home = "${androidsdk}/libexec/android-sdk"; android-home = "${androidsdk}/libexec/android-sdk";
ndk-home = "${android-home}/ndk/${ndk-version}"; ndk-home = "${android-home}/ndk/${ndk-version}";
use_android = true;
in in
mkShell { mkShell {
@@ -25,11 +26,10 @@ mkShell {
heaptrack heaptrack
# android ] ++ pkgs.lib.optional use_android [ jre openssl libiconv androidsdk ] ;
#jre openssl libiconv androidsdk
];
#ANDROID_HOME = android-home;
#NDK_HOME = ndk-home;
LD_LIBRARY_PATH="${x11libs}"; LD_LIBRARY_PATH="${x11libs}";
} } // (if !use_android then {} else {
ANDROID_HOME = android-home;
NDK_HOME = ndk-home;
})