public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android-studio: rearrange dependencies

Browse Source
This commit is contained in:
Hoang Xuan Phu 2016-12-28 20:31:19 +08:00
parent 4e513cbc9f
commit 1f67c179ac
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/editors/android-studio/default.nix
View File

@ -65,6 +65,15 @@ let
git 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
# Gradle wants libstdc++.so.6 # Gradle wants libstdc++.so.6
stdenv.cc.cc.lib stdenv.cc.cc.lib
# mksdcard wants 32 bit libstdc++.so.6 # mksdcard wants 32 bit libstdc++.so.6
@ -79,12 +88,6 @@ let
# For Android emulator # For Android emulator
libpulseaudio libpulseaudio
libX11 libX11
libXext
libXrender
libXtst
libXi
freetype
fontconfig
]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
''; '';
src = fetchurl { src = fetchurl {

1
pkgs/top-level/all-packages.nix
View File

@ -12323,7 +12323,6 @@ in
amsn = callPackage ../applications/networking/instant-messengers/amsn { }; amsn = callPackage ../applications/networking/instant-messengers/amsn { };
android-studio = callPackage ../applications/editors/android-studio { android-studio = callPackage ../applications/editors/android-studio {
inherit (xorg) libX11 libXext libXi libXrandr libXrender libXtst;
}; };
antimony = qt5.callPackage ../applications/graphics/antimony {}; antimony = qt5.callPackage ../applications/graphics/antimony {};