diff options
Diffstat (limited to 'pkgs/development/mobile/androidenv/tools/26.nix')
| -rw-r--r-- | pkgs/development/mobile/androidenv/tools/26.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix index a768a120547..7a8f4cd660f 100644 --- a/pkgs/development/mobile/androidenv/tools/26.nix +++ b/pkgs/development/mobile/androidenv/tools/26.nix @@ -3,8 +3,12 @@ deployAndroidPackage { name = "androidsdk"; inherit os package; - buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXrender pkgs.xorg.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.xorg.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; + buildInputs = [ makeWrapper ] + ++ lib.optional (os == "linux") ( + (with pkgs; [ autoPatchelfHook glibc freetype fontconfig fontconfig.lib]) + ++ (with pkgs.xorg; [ libX11 libXrender libXext ]) + ++ (with pkgs_i686; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) + ); patchInstructions = '' ${lib.optionalString (os == "linux") '' |