androidenv: fix autopatching toolchains

[jakubgs]

Description of changes

Use of binaries from NDK toolchains has been broken by following PR:

• androidenv: fix darwin ndk symlink #195752

I'm splitting the patchInstructions to run the ELF patching only on Linux.

[nix-shell:~/work/status-mobile]$ $ANDROID_HOME/ndk/22.1.7171670/toolchains/x86_64-4.9/prebuilt/linux-x86_64/bin/x86_64-linux-android-strip --help
bash: /nix/store/084pp923k5k24gnb44h9d6azk84grnh8-androidsdk-mod-sdk/ndk/22.1.7171670/toolchains/x86_64-4.9/prebuilt/linux-x86_64/bin/x86_64-linux-android-strip: No such file or directory

Related to another fix of bug introduced by #195752:

• androidenv: fix patching linux prebuilt binaries #215492

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 23.05 Release Notes (or backporting 22.11 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

[wegank]

andoridenv -> androidenv

[sheldonneuberger-sc]

Sorry for breaking this. The reason for the change is that autoPatchelf won't work on mac. I think we can make both linux and mac work by either:

1. Gate this part of the script to only run on linux, or
2. Implicitly make it skip darwin dirs (like /nix/store/lzvf8r573yqsi409s86qkn4kil8sr7j8-ndk-23.0.7599858/libexec/android-sdk/ndk/23.0.7599858/toolchains/llvm/prebuilt/darwin-x86_64)

[jakubgs]

How exactly does it break it?

[sheldonneuberger-sc]

On mac it gives this error autoPatchelf: command not found. This would fix it, just move the autoPatchelf sections into an isLinux section (I had originally put up a PR that did this, but IIRC someone preferred not having "if isLinux" logic in the script, not sure why).

efe9215

[jakubgs]

You know you can just link to a diff on GitHub? Also, you can add highlights to a diff by writing diff after first triple backticks.

My question would be, which steps are necessary on Macos? Because those could just be extracted out into a separate phase that would the be called by runHook.

[jakubgs]

Also, if the issue is just missing patchelf, why not just include it?

nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix

Lines 12 to 13 in 2a14c00

	nativeBuildInputs = [ makeWrapper ]
	++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];

Maybe I'm missing something, but what's stopping us from just doing:

  nativeBuildInputs = [ makeWrapper autoPatchelfHook ];

[wegank]

Maybe I'm missing something, but what's stopping us from just doing:

  nativeBuildInputs = [ makeWrapper autoPatchelfHook ];

macOS executables aren't in ELF format, so autoPatchelfHook doesn't apply.

[sheldonneuberger-sc]

autoPatchelfhook can't be built on mac. I missed one of the elf sections, here's an updated diff efe9215. AFAIK, all of the other patches should still be done on mac.

[jakubgs]

@SuperSandro2000 any chance we could get this merged?