nix: package outputs of build in .aar file

Add nix `result` folder to gitignore also.

Referenced issue:
* https://github.com/waku-org/nwaku/issues/3232
This commit is contained in:
Marko Burčul 2025-05-23 09:05:22 +02:00
parent 8fd9a7a9ea
commit e755fd834f
No known key found for this signature in database
GPG Key ID: FC4CD2F9A040D54A
3 changed files with 11 additions and 2 deletions

3
.gitignore vendored
View File

@ -76,3 +76,6 @@ coverage_html_report/
.qmake.stash
main-qt
waku_handler.moc.cpp
# Nix build result
result

View File

@ -51,6 +51,7 @@
src = self;
targets = ["libwaku-android-arm64"];
androidArch = "aarch64-linux-android";
abidir = "arm64-v8a";
zerokitPkg = zerokit.packages.${system}.zerokit-android-arm64;
};
default = libwaku-android-arm64;

View File

@ -10,6 +10,7 @@
"x86_64-linux" "aarch64-linux"
],
androidArch,
abidir,
zerokitPkg,
}:
@ -32,6 +33,7 @@ in stdenv.mkDerivation rec {
buildInputs = with pkgs; [
openssl
gmp
zip
];
# Dependencies that should only exist in the build environment.
@ -62,6 +64,7 @@ in stdenv.mkDerivation rec {
ANDROID_NDK_HOME="${pkgs.androidPkgs.ndk}";
NIMFLAGS = "-d:disableMarchNative -d:git_revision_override=${revision}";
XDG_CACHE_HOME = "/tmp";
androidManifest = "<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\" package=\"com.example.mylibrary\" />";
makeFlags = targets ++ [
"V=${toString verbosity}"
@ -98,8 +101,10 @@ in stdenv.mkDerivation rec {
'';
installPhase = ''
mkdir -p $out/build/android
cp -r ./build/android/* $out/build/android/
mkdir -p $out/jni
cp -r ./build/android/${abidir}/* $out/jni/
echo '${androidManifest}' > $out/jni/AndroidManifest.xml
cd $out && zip -r libwaku.aar *
'';
meta = with pkgs.lib; {