diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index a607ed31900..f0b9a77d3f1 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,4 +1,4 @@ -{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: +{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses, coreutils}: stdenv.mkDerivation rec { version = "28.0.3"; @@ -20,9 +20,14 @@ stdenv.mkDerivation rec { unzip $src mv android-* ${version} + cd ${version} + + for f in $(grep -Rl /bin/ls .); do + sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f" + done + ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") '' - cd ${version} ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5 diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index bd369200bd5..0291986b5a4 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -10,7 +10,7 @@ rec { }; buildTools = import ./build-tools.nix { - inherit (pkgs) stdenv fetchurl unzip zlib file; + inherit (pkgs) stdenv fetchurl unzip zlib file coreutils; stdenv_32bit = pkgs_i686.stdenv; zlib_32bit = pkgs_i686.zlib; ncurses_32bit = pkgs_i686.ncurses5;