diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-01-10 20:05:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 20:05:42 -0500 |
| commit | acc889f5ed82c7fbdc3fb24bf3a767a875b8eb9c (patch) | |
| tree | 3469ad6c8ad33fc346519a507262c81d87ae3592 /pkgs/applications/editors | |
| parent | e5906592950b508e796774657c3de0cad1c99e33 (diff) | |
| parent | 4b3f79b3ca0f1aa771c5838c030f72bdd159d343 (diff) | |
| download | nixlib-acc889f5ed82c7fbdc3fb24bf3a767a875b8eb9c.tar nixlib-acc889f5ed82c7fbdc3fb24bf3a767a875b8eb9c.tar.gz nixlib-acc889f5ed82c7fbdc3fb24bf3a767a875b8eb9c.tar.bz2 nixlib-acc889f5ed82c7fbdc3fb24bf3a767a875b8eb9c.tar.lz nixlib-acc889f5ed82c7fbdc3fb24bf3a767a875b8eb9c.tar.xz nixlib-acc889f5ed82c7fbdc3fb24bf3a767a875b8eb9c.tar.zst nixlib-acc889f5ed82c7fbdc3fb24bf3a767a875b8eb9c.zip | |
Merge pull request #21462 from phunehehe/android-studio
Fontconfig for Android Studio
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/android-studio/default.nix | 83 |
1 files changed, 45 insertions, 38 deletions
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2e14ae339cf7..28b6b2b85ad4 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,7 +9,6 @@ , gnugrep , gnutar , gzip -, jdk , fontconfig , freetype , libpulseaudio @@ -29,6 +28,7 @@ , writeTextFile , xkeyboard_config , zlib +, fontsConf }: let @@ -44,50 +44,57 @@ 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 - jdk - 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 [ - # Gradle wants libstdc++.so.6 - stdenv.cc.cc.lib - # mksdcard wants 32 bit libstdc++.so.6 - pkgsi686Linux.stdenv.cc.cc.lib + ]}" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ - # aapt wants libz.so.1 - zlib - pkgsi686Linux.zlib - # Support multiple monitors - libXrandr + # Crash at startup without these + fontconfig + freetype + libXext + libXi + libXrender + libXtst - # For Android emulator - libpulseaudio - libX11 - libXext - libXrender - libXtst - libXi - freetype - fontconfig - ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" + # 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 + + # For Android emulator + libpulseaudio + libX11 + + ]}" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --set FONTCONFIG_FILE ${fontsConf} ''; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; |