diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2013-08-05 22:18:56 +0200 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2013-08-05 22:18:56 +0200 |
| commit | f5f5f69ef0de289b817e552311bad988c209c0f9 (patch) | |
| tree | 995bcd74027bf9550a80075708f1b4925d547f4e /pkgs/development/mobile | |
| parent | 7019b685de75b7cec5454d7901744cd92328d271 (diff) | |
| download | nixlib-f5f5f69ef0de289b817e552311bad988c209c0f9.tar nixlib-f5f5f69ef0de289b817e552311bad988c209c0f9.tar.gz nixlib-f5f5f69ef0de289b817e552311bad988c209c0f9.tar.bz2 nixlib-f5f5f69ef0de289b817e552311bad988c209c0f9.tar.lz nixlib-f5f5f69ef0de289b817e552311bad988c209c0f9.tar.xz nixlib-f5f5f69ef0de289b817e552311bad988c209c0f9.tar.zst nixlib-f5f5f69ef0de289b817e552311bad988c209c0f9.zip | |
The emulator needs file in its PATH and alsaLib
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/androidenv/androidsdk.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/mobile/androidenv/default.nix | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 1573de63e096..11e6b0c45a2a 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,9 +1,9 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper , platformTools, buildTools, support, platforms, sysimages, addons , zlib_32bit -, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit -, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa -, freetype, fontconfig, gtk, atk +, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit +, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa, alsaLib +, freetype, fontconfig, gtk, atk, file }: {platformVersions, abiVersions, useGoogleAPIs}: @@ -61,6 +61,7 @@ stdenv.mkDerivation { for i in emulator emulator-arm emulator-mips emulator-x86 do wrapProgram `pwd`/$i \ + --prefix PATH : ${file}/bin \ --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib done @@ -68,7 +69,8 @@ stdenv.mkDerivation { for i in emulator64-arm emulator64-mips emulator64-x86 do wrapProgram `pwd`/$i \ - --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib + --prefix PATH : ${file}/bin \ + --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib:${alsaLib}/lib done ''} ''} diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 6e410d4c5db9..9fec70da9403 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -36,7 +36,7 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) freetype fontconfig gtk atk mesa; + inherit (pkgs) freetype fontconfig gtk atk mesa file alsaLib; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp; inherit platformTools buildTools support platforms sysimages addons; @@ -49,6 +49,7 @@ rec { libXdmcp_32bit = pkgs_i686.xorg.libXdmcp; libXext_32bit = pkgs_i686.xorg.libXext; mesa_32bit = pkgs_i686.mesa; + alsaLib_32bit = pkgs_i686.alsaLib; }; androidsdk_4_1 = androidsdk { |