From 1f67c179acb8b2d9b711d38b4ddd2103f386589f Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Wed, 28 Dec 2016 20:31:19 +0800
Subject: [PATCH] android-studio: rearrange dependencies

---
 .../editors/android-studio/default.nix            | 15 +++++++++------
 pkgs/top-level/all-packages.nix                   |  1 -
 2 files changed, 9 insertions(+), 7 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 {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f2f9186562..7c4039c374f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12323,7 +12323,6 @@ in
   amsn = callPackage ../applications/networking/instant-messengers/amsn { };
 
   android-studio = callPackage ../applications/editors/android-studio {
-      inherit (xorg) libX11 libXext libXi libXrandr libXrender libXtst;
   };
 
   antimony = qt5.callPackage ../applications/graphics/antimony {};