Commit d87ffe4 1 parent 3b3d576 commit d87ffe4 Copy full SHA for d87ffe4
File tree 3 files changed +41
-4
lines changed
3 files changed +41
-4
lines changed Original file line number Diff line number Diff line change @@ -248,6 +248,10 @@ jobs:
248
248
cp result/*.whl dist/
249
249
nix build .#deltachat-rpc-server-win32-wheel
250
250
cp result/*.whl dist/
251
+ nix build .#deltachat-rpc-server-arm64-v8a-android-wheel
252
+ cp result/*.whl dist/
253
+ nix build .#deltachat-rpc-server-armeabi-v7a-android-wheel
254
+ cp result/*.whl dist/
251
255
nix build .#deltachat-rpc-server-source
252
256
cp result/*.tar.gz dist/
253
257
python3 scripts/wheel-rpc-server.py x86_64-darwin bin/deltachat-rpc-server-x86_64-macos
Original file line number Diff line number Diff line change 309
309
LD = "${ targetCc } " ;
310
310
} ;
311
311
312
- mkAndroidPackages = arch : {
313
- "deltachat-rpc-server-${ arch } -android" = mkAndroidRustPackage arch "deltachat-rpc-server" ;
314
- "deltachat-repl-${ arch } -android" = mkAndroidRustPackage arch "deltachat-repl" ;
315
- } ;
312
+ mkAndroidPackages = arch :
313
+ let
314
+ rpc-server = mkAndroidRustPackage arch "deltachat-rpc-server" ;
315
+ in
316
+ {
317
+ "deltachat-rpc-server-${ arch } -android" = rpc-server ;
318
+ "deltachat-repl-${ arch } -android" = mkAndroidRustPackage arch "deltachat-repl" ;
319
+ "deltachat-rpc-server-${ arch } -android-wheel" =
320
+ pkgs . stdenv . mkDerivation {
321
+ pname = "deltachat-rpc-server-${ arch } -android-wheel" ;
322
+ version = manifest . version ;
323
+ src = nix-filter . lib {
324
+ root = ./. ;
325
+ include = [
326
+ "scripts/wheel-rpc-server.py"
327
+ "deltachat-rpc-server/README.md"
328
+ "LICENSE"
329
+ "Cargo.toml"
330
+ ] ;
331
+ } ;
332
+ nativeBuildInputs = [
333
+ pkgs . python3
334
+ pkgs . python3Packages . wheel
335
+ ] ;
336
+ buildInputs = [
337
+ rpc-server
338
+ ] ;
339
+ buildPhase = ''
340
+ mkdir tmp
341
+ cp ${ rpc-server } /bin/deltachat-rpc-server tmp/deltachat-rpc-server
342
+ python3 scripts/wheel-rpc-server.py ${ arch } -android tmp/deltachat-rpc-server
343
+ '' ;
344
+ installPhase = ''mkdir -p $out; cp -av deltachat_rpc_server-*.whl $out'' ;
345
+ } ;
346
+ } ;
316
347
317
348
mkRustPackages = arch :
318
349
let
Original file line number Diff line number Diff line change @@ -154,6 +154,8 @@ def main():
154
154
"armv6l-linux" : "linux_armv6l" ,
155
155
"aarch64-linux" : "manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64" ,
156
156
"i686-linux" : "manylinux_2_12_i686.manylinux2010_i686.musllinux_1_1_i686" ,
157
+ "arm64-v8a-android" : "android_21_arm64_v8a" ,
158
+ "armeabi-v7a-android" : "android_21_armeabi_v7a" ,
157
159
"win64" : "win_amd64" ,
158
160
"win32" : "win32" ,
159
161
# macOS versions for platform compatibility tags are taken from https://doc.rust-lang.org/rustc/platform-support.html
You can’t perform that action at this time.
0 commit comments