mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-01-07 16:33:08 +00:00
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:
parent
8fd9a7a9ea
commit
e755fd834f
3
.gitignore
vendored
3
.gitignore
vendored
@ -76,3 +76,6 @@ coverage_html_report/
|
|||||||
.qmake.stash
|
.qmake.stash
|
||||||
main-qt
|
main-qt
|
||||||
waku_handler.moc.cpp
|
waku_handler.moc.cpp
|
||||||
|
|
||||||
|
# Nix build result
|
||||||
|
result
|
||||||
|
|||||||
@ -51,6 +51,7 @@
|
|||||||
src = self;
|
src = self;
|
||||||
targets = ["libwaku-android-arm64"];
|
targets = ["libwaku-android-arm64"];
|
||||||
androidArch = "aarch64-linux-android";
|
androidArch = "aarch64-linux-android";
|
||||||
|
abidir = "arm64-v8a";
|
||||||
zerokitPkg = zerokit.packages.${system}.zerokit-android-arm64;
|
zerokitPkg = zerokit.packages.${system}.zerokit-android-arm64;
|
||||||
};
|
};
|
||||||
default = libwaku-android-arm64;
|
default = libwaku-android-arm64;
|
||||||
|
|||||||
@ -10,6 +10,7 @@
|
|||||||
"x86_64-linux" "aarch64-linux"
|
"x86_64-linux" "aarch64-linux"
|
||||||
],
|
],
|
||||||
androidArch,
|
androidArch,
|
||||||
|
abidir,
|
||||||
zerokitPkg,
|
zerokitPkg,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -32,6 +33,7 @@ in stdenv.mkDerivation rec {
|
|||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
openssl
|
openssl
|
||||||
gmp
|
gmp
|
||||||
|
zip
|
||||||
];
|
];
|
||||||
|
|
||||||
# Dependencies that should only exist in the build environment.
|
# Dependencies that should only exist in the build environment.
|
||||||
@ -62,6 +64,7 @@ in stdenv.mkDerivation rec {
|
|||||||
ANDROID_NDK_HOME="${pkgs.androidPkgs.ndk}";
|
ANDROID_NDK_HOME="${pkgs.androidPkgs.ndk}";
|
||||||
NIMFLAGS = "-d:disableMarchNative -d:git_revision_override=${revision}";
|
NIMFLAGS = "-d:disableMarchNative -d:git_revision_override=${revision}";
|
||||||
XDG_CACHE_HOME = "/tmp";
|
XDG_CACHE_HOME = "/tmp";
|
||||||
|
androidManifest = "<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\" package=\"com.example.mylibrary\" />";
|
||||||
|
|
||||||
makeFlags = targets ++ [
|
makeFlags = targets ++ [
|
||||||
"V=${toString verbosity}"
|
"V=${toString verbosity}"
|
||||||
@ -98,8 +101,10 @@ in stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/build/android
|
mkdir -p $out/jni
|
||||||
cp -r ./build/android/* $out/build/android/
|
cp -r ./build/android/${abidir}/* $out/jni/
|
||||||
|
echo '${androidManifest}' > $out/jni/AndroidManifest.xml
|
||||||
|
cd $out && zip -r libwaku.aar *
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with pkgs.lib; {
|
meta = with pkgs.lib; {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user