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

android-studio: use a dedicated fontconfig file

Browse Source
This commit is contained in:
Hoang Xuan Phu 2016-12-28 20:37:03 +08:00
parent d849f00af5
commit 4b3f79b3ca
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@
, writeTextFile , writeTextFile
, xkeyboard_config , xkeyboard_config
, zlib , zlib
, fontsConf
}: }:
let let
@ -92,7 +93,8 @@ let
libX11 libX11
]}" \ ]}" \
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
--set FONTCONFIG_FILE ${fontsConf}
''; '';
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";

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

@ -12323,6 +12323,9 @@ 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 {
fontsConf = makeFontsConf {
fontDirectories = [];
};
}; };
antimony = qt5.callPackage ../applications/graphics/antimony {}; antimony = qt5.callPackage ../applications/graphics/antimony {};