diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-01-16 17:23:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 17:23:14 +0000 |
| commit | 13b4f440fc7accaf800345a81af548f8f89db08f (patch) | |
| tree | 312c45cdbd4207bc5803354c0d9057179df47145 /pkgs/applications | |
| parent | 2ea3db283090c43baed12f9cf6019fbbb99170e1 (diff) | |
| parent | 17dcd33e008ec3e7d6d77fe6dbecdd605e000237 (diff) | |
| download | nixlib-13b4f440fc7accaf800345a81af548f8f89db08f.tar nixlib-13b4f440fc7accaf800345a81af548f8f89db08f.tar.gz nixlib-13b4f440fc7accaf800345a81af548f8f89db08f.tar.bz2 nixlib-13b4f440fc7accaf800345a81af548f8f89db08f.tar.lz nixlib-13b4f440fc7accaf800345a81af548f8f89db08f.tar.xz nixlib-13b4f440fc7accaf800345a81af548f8f89db08f.tar.zst nixlib-13b4f440fc7accaf800345a81af548f8f89db08f.zip | |
Merge pull request #33634 from Ma27/android-studio/support-virtual-devices
android-studio: set `ANDROID_EMULATOR_USE_SYSTEM_LIBS`
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 360d373f0707..2c2227dd4ee9 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -34,7 +34,7 @@ let androidStudio = stdenv.mkDerivation { - name = "${pname}"; + name = "${pname}-${version}"; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; @@ -48,6 +48,7 @@ let installPhase = '' cp -r . $out wrapProgram $out/bin/studio.sh \ + --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set PATH "${stdenv.lib.makeBinPath [ # Checked in studio.sh @@ -68,7 +69,6 @@ let # Runtime stuff git - ]}" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ |