android-studio: rearrange dependencies

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 {

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 {};