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

android-studio: reindent wrapProgram parameters

This commit is contained in:
Hoang Xuan Phu 2016-12-28 20:34:50 +08:00
parent 1f67c179ac
commit d849f00af5
1 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
pkgs/applications/editors/android-studio/default.nix
View File

@ -43,52 +43,56 @@ let
]; ];
installPhase = '' installPhase = ''
cp -r . $out cp -r . $out
wrapProgram $out/bin/studio.sh --set PATH "${stdenv.lib.makeBinPath [ wrapProgram $out/bin/studio.sh \
--set PATH "${stdenv.lib.makeBinPath [
# Checked in studio.sh # Checked in studio.sh
coreutils coreutils
findutils findutils
gnugrep gnugrep
which which
# For Android emulator # For Android emulator
file file
glxinfo glxinfo
pciutils pciutils
setxkbmap setxkbmap
# Used during setup wizard # Used during setup wizard
gnutar gnutar
gzip gzip
# Runtime stuff # Runtime stuff
git git
]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ ]}" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
# Crash at startup without these # Crash at startup without these
fontconfig fontconfig
freetype freetype
libXext libXext
libXi libXi
libXrender libXrender
libXtst libXtst
# Gradle wants libstdc++.so.6 # Gradle wants libstdc++.so.6
stdenv.cc.cc.lib stdenv.cc.cc.lib
# mksdcard wants 32 bit libstdc++.so.6 # mksdcard wants 32 bit libstdc++.so.6
pkgsi686Linux.stdenv.cc.cc.lib pkgsi686Linux.stdenv.cc.cc.lib
# aapt wants libz.so.1 # aapt wants libz.so.1
zlib zlib
pkgsi686Linux.zlib pkgsi686Linux.zlib
# Support multiple monitors # Support multiple monitors
libXrandr libXrandr
# For Android emulator # For Android emulator
libpulseaudio libpulseaudio
libX11 libX11
]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
]}" \
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
''; '';
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";