diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-12-06 11:07:37 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-12-06 11:07:40 +0100 |
| commit | 3afc4e8a813e6c2677395df9f4c901c545d73db9 (patch) | |
| tree | 7d317d27a7eacc376bd421da2afa2e0d344a89fc /pkgs/development/mobile | |
| parent | cf7475d2061ac3ada4b226571a4a1bb91420b578 (diff) | |
| download | nixlib-3afc4e8a813e6c2677395df9f4c901c545d73db9.tar nixlib-3afc4e8a813e6c2677395df9f4c901c545d73db9.tar.gz nixlib-3afc4e8a813e6c2677395df9f4c901c545d73db9.tar.bz2 nixlib-3afc4e8a813e6c2677395df9f4c901c545d73db9.tar.lz nixlib-3afc4e8a813e6c2677395df9f4c901c545d73db9.tar.xz nixlib-3afc4e8a813e6c2677395df9f4c901c545d73db9.tar.zst nixlib-3afc4e8a813e6c2677395df9f4c901c545d73db9.zip | |
androidsdk_9_0: fix evaluation without aliases
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/androidenv/tools/25.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/mobile/androidenv/tools/25.nix b/pkgs/development/mobile/androidenv/tools/25.nix index 80b5858031d2..7489569d5071 100644 --- a/pkgs/development/mobile/androidenv/tools/25.nix +++ b/pkgs/development/mobile/androidenv/tools/25.nix @@ -3,7 +3,7 @@ deployAndroidPackage { name = "androidsdk"; 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; patchInstructions = '' @@ -41,7 +41,7 @@ deployAndroidPackage { do wrapProgram $PWD/$i \ --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 ${lib.optionalString (os == "linux") '' |