Skip to content

androidenv.androidsdk: patch x64 interpreter path of emulator{,-check} #49564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nicknovitski wants to merge 1 commit into from
Closed

androidenv.androidsdk: patch x64 interpreter path of emulator{,-check} #49564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkgs/development/mobile/androidenv/androidsdk.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ stdenv.mkDerivation rec {
--prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}

# The emulators need additional libraries, which are dynamically loaded => let's wrap them

${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
for i in emulator emulator-check
do
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
Copy link
Member

@Mic92 Mic92 Oct 31, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is this pull request that also extends the rpath: https://github.com/NixOS/nixpkgs/pull/49515/files

Copy link
Contributor Author

@nicknovitski nicknovitski Nov 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I was able to run the binaries just by changing the interpreter, but maybe there were bugs I wasn't hitting.

Copy link
Member

@Mic92 Mic92 Nov 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After thinking about it a bit I think it might be also not necessary because the wrapper already puts the same shared library directory with LD_LIBRARY_PATH into the scope.

# The emulators need additional libraries, which are dynamically loaded => let's wrap them
wrapProgram `pwd`/$i \
--prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \
--suffix LD_LIBRARY_PATH : `pwd`/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext libGLU_combined alsaLib zlib libpulseaudio dbus.lib ]} \
Expand Down