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

The emulator needs file in its PATH and alsaLib

Browse Source
This commit is contained in:
Sander van der Burg 2013-08-05 22:18:56 +02:00
parent 7019b685de
commit f5f5f69ef0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/mobile/androidenv/androidsdk.nix
View File

@ -1,9 +1,9 @@
{ stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper
, platformTools, buildTools, support, platforms, sysimages, addons , platformTools, buildTools, support, platforms, sysimages, addons
, zlib_32bit , zlib_32bit
, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit , libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit
, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa, alsaLib
, freetype, fontconfig, gtk, atk , freetype, fontconfig, gtk, atk, file
}: }:
{platformVersions, abiVersions, useGoogleAPIs}: {platformVersions, abiVersions, useGoogleAPIs}:
@ -61,6 +61,7 @@ stdenv.mkDerivation {
for i in emulator emulator-arm emulator-mips emulator-x86 for i in emulator emulator-arm emulator-mips emulator-x86
do do
wrapProgram `pwd`/$i \ 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 --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 done
@ -68,7 +69,8 @@ stdenv.mkDerivation {
for i in emulator64-arm emulator64-mips emulator64-x86 for i in emulator64-arm emulator64-mips emulator64-x86
do do
wrapProgram `pwd`/$i \ 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 done
''} ''}
''} ''}

3
pkgs/development/mobile/androidenv/default.nix
View File

@ -36,7 +36,7 @@ rec {
androidsdk = import ./androidsdk.nix { androidsdk = import ./androidsdk.nix {
inherit (pkgs) stdenv fetchurl unzip makeWrapper; 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 (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp;
inherit platformTools buildTools support platforms sysimages addons; inherit platformTools buildTools support platforms sysimages addons;
@ -49,6 +49,7 @@ rec {
libXdmcp_32bit = pkgs_i686.xorg.libXdmcp; libXdmcp_32bit = pkgs_i686.xorg.libXdmcp;
libXext_32bit = pkgs_i686.xorg.libXext; libXext_32bit = pkgs_i686.xorg.libXext;
mesa_32bit = pkgs_i686.mesa; mesa_32bit = pkgs_i686.mesa;
alsaLib_32bit = pkgs_i686.alsaLib;
}; };
androidsdk_4_1 = androidsdk { androidsdk_4_1 = androidsdk {