diff options
| author | Hoang Xuan Phu <phuhimself@phunehehe.net> | 2016-12-28 20:31:19 +0800 |
|---|---|---|
| committer | Hoang Xuan Phu <phuhimself@phunehehe.net> | 2017-01-10 13:35:37 +0800 |
| commit | 1f67c179acb8b2d9b711d38b4ddd2103f386589f (patch) | |
| tree | 2f1a08e636baf07f1e0bcff780ea31e8562a5048 /pkgs/applications/editors | |
| parent | 4e513cbc9fbc0fc0ead6f8f897fcc73d544a62be (diff) | |
| download | nixpkgs-1f67c179acb8b2d9b711d38b4ddd2103f386589f.tar nixpkgs-1f67c179acb8b2d9b711d38b4ddd2103f386589f.tar.gz nixpkgs-1f67c179acb8b2d9b711d38b4ddd2103f386589f.tar.bz2 nixpkgs-1f67c179acb8b2d9b711d38b4ddd2103f386589f.tar.lz nixpkgs-1f67c179acb8b2d9b711d38b4ddd2103f386589f.tar.xz nixpkgs-1f67c179acb8b2d9b711d38b4ddd2103f386589f.tar.zst nixpkgs-1f67c179acb8b2d9b711d38b4ddd2103f386589f.zip | |
android-studio: rearrange dependencies
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/android-studio/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index eb2d27c6139..ac8140a845c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -65,6 +65,15 @@ let git ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + + # 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 @@ -79,12 +88,6 @@ let # For Android emulator libpulseaudio libX11 - libXext - libXrender - libXtst - libXi - freetype - fontconfig ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" ''; src = fetchurl { |