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

android_prebuilt: Fix eval

This commit is contained in:
s1341 2021-02-10 20:38:17 +02:00 committed by John Ericson
parent 739381f0c1
commit aee60bef7a
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/bintools-wrapper/default.nix
View File

@ -53,7 +53,8 @@ let
dynamicLinker = dynamicLinker =
/**/ if libc == null then null /**/ if libc == null then null
else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*" else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*"
else if targetPlatform.libc == "bionic" then "/system/bin/linker" else if (targetPlatform.libc == "bionic" && targetPlatform.is32bit) then "/system/bin/linker"
else if (targetPlatform.libc == "bionic" && targetPlatform.is64bit) then "/system/bin/linker64"
else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so" else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so"
else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2"
else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2"

5
pkgs/build-support/cc-wrapper/default.nix
View File

@ -298,7 +298,10 @@ stdenv.mkDerivation {
# vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See # vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See
# https://clang.llvm.org/docs/Toolchain.html for all the axes one might # https://clang.llvm.org/docs/Toolchain.html for all the axes one might
# break `useLLVM` into.) # break `useLLVM` into.)
+ optionalString (isClang && gccForLibs != null && targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' + optionalString (isClang && gccForLibs != null
&& targetPlatform.isLinux
&& !(stdenv.targetPlatform.useAndroidPrebuilt or false)
&& !(stdenv.targetPlatform.useLLVM or false)) ''
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
'' ''

3
pkgs/development/mobile/androidenv/compose-android-packages.nix
View File

@ -24,7 +24,8 @@
}: }:
let let
inherit (pkgs) stdenv lib fetchurl makeWrapper unzip; inherit (pkgs) stdenv lib fetchurl;
inherit (pkgs.buildPackages) makeWrapper unzip;
# Determine the Android os identifier from Nix's system identifier # Determine the Android os identifier from Nix's system identifier
os = if stdenv.system == "x86_64-linux" then "linux" os = if stdenv.system == "x86_64-linux" then "linux"