public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33634 from Ma27/android-studio/support-virtual-devices

Browse Source 
android-studio: set `ANDROID_EMULATOR_USE_SYSTEM_LIBS`
This commit is contained in:
Franz Pletz 2018-01-16 17:23:14 +00:00 committed by GitHub
commit 13b4f440fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/android-studio/common.nix
View File

@ -34,7 +34,7 @@
let let
androidStudio = stdenv.mkDerivation { androidStudio = stdenv.mkDerivation {
name = "${pname}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
@ -48,6 +48,7 @@ let
installPhase = '' installPhase = ''
cp -r . $out cp -r . $out
wrapProgram $out/bin/studio.sh \ wrapProgram $out/bin/studio.sh \
--set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
--set PATH "${stdenv.lib.makeBinPath [ --set PATH "${stdenv.lib.makeBinPath [
# Checked in studio.sh # Checked in studio.sh
@ -68,7 +69,6 @@ let
# Runtime stuff # Runtime stuff
git git
]}" \ ]}" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [