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

androidsdk_9_0: fix evaluation without aliases

Browse Source
This commit is contained in:
Jan Tojnar 2020-12-06 11:07:37 +01:00
parent cf7475d206
commit 3afc4e8a81
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/mobile/androidenv/tools/25.nix
View File

@ -3,7 +3,7 @@
deployAndroidPackage { deployAndroidPackage {
name = "androidsdk"; name = "androidsdk";
buildInputs = [ autoPatchelfHook makeWrapper ] buildInputs = [ autoPatchelfHook makeWrapper ]
++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXext pkgs.xlibs.libXdamage pkgs.xlibs.libxcb pkgs.xlibs.libXfixes pkgs.xlibs.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ];
inherit package os; inherit package os;
patchInstructions = '' patchInstructions = ''
@ -41,7 +41,7 @@ deployAndroidPackage {
do do
wrapProgram $PWD/$i \ wrapProgram $PWD/$i \
--prefix PATH : ${pkgs.jdk8}/bin \ --prefix PATH : ${pkgs.jdk8}/bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]} --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]}
done done
${lib.optionalString (os == "linux") '' ${lib.optionalString (os == "linux") ''