diff options
| author | Hoang Xuan Phu <phuhimself@phunehehe.net> | 2016-12-28 20:34:50 +0800 |
|---|---|---|
| committer | Hoang Xuan Phu <phuhimself@phunehehe.net> | 2017-01-10 13:35:37 +0800 |
| commit | d849f00af52c0cebe8d09e026d9871b9a2a175ca (patch) | |
| tree | a26aca7a41d5ea73f9a9484126ac4f3d350edf74 /pkgs/applications/editors | |
| parent | 1f67c179acb8b2d9b711d38b4ddd2103f386589f (diff) | |
| download | nixlib-d849f00af52c0cebe8d09e026d9871b9a2a175ca.tar nixlib-d849f00af52c0cebe8d09e026d9871b9a2a175ca.tar.gz nixlib-d849f00af52c0cebe8d09e026d9871b9a2a175ca.tar.bz2 nixlib-d849f00af52c0cebe8d09e026d9871b9a2a175ca.tar.lz nixlib-d849f00af52c0cebe8d09e026d9871b9a2a175ca.tar.xz nixlib-d849f00af52c0cebe8d09e026d9871b9a2a175ca.tar.zst nixlib-d849f00af52c0cebe8d09e026d9871b9a2a175ca.zip | |
android-studio: reindent wrapProgram parameters
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/android-studio/default.nix | 78 |
1 files changed, 41 insertions, 37 deletions
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ac8140a845ce..abb93d745a6e 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -43,52 +43,56 @@ let ]; installPhase = '' 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 - coreutils - findutils - gnugrep - which + # Checked in studio.sh + coreutils + findutils + gnugrep + which - # For Android emulator - file - glxinfo - pciutils - setxkbmap + # For Android emulator + file + glxinfo + pciutils + setxkbmap - # Used during setup wizard - gnutar - gzip + # Used during setup wizard + gnutar + gzip - # Runtime stuff - git + # Runtime stuff + git - ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + ]}" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ - # Crash at startup without these - fontconfig - freetype - libXext - libXi - libXrender - libXtst + # Crash at startup without these + fontconfig + freetype + libXext + libXi + libXrender + libXtst - # Gradle wants libstdc++.so.6 - stdenv.cc.cc.lib - # mksdcard wants 32 bit libstdc++.so.6 - pkgsi686Linux.stdenv.cc.cc.lib + # Gradle wants libstdc++.so.6 + stdenv.cc.cc.lib + # mksdcard wants 32 bit libstdc++.so.6 + pkgsi686Linux.stdenv.cc.cc.lib - # aapt wants libz.so.1 - zlib - pkgsi686Linux.zlib - # Support multiple monitors - libXrandr + # aapt wants libz.so.1 + zlib + pkgsi686Linux.zlib + # Support multiple monitors + libXrandr - # For Android emulator - libpulseaudio - libX11 - ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" + # For Android emulator + libpulseaudio + libX11 + + ]}" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" ''; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; |