From ec8f320797e37750fbf0eae2bd5cc9fac4542b78 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Tue, 23 Oct 2018 08:12:32 -0700 Subject: [PATCH] androidenv.androidndk: patch prebuilt 64bit binaries --- pkgs/development/mobile/androidenv/androidndk.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 072a6dc3168..23ae4378dc6 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -89,6 +89,16 @@ let do wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" done + + ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' + for i in ${pkg_path}/prebuilt/linux-x86_64/bin/* + do + if ! isELF $i; then continue; fi + patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i + done + ''} + # make some executables available in PATH mkdir -pv ${bin_path} for i in \