Merge pull request #115118 from obsidiansystems/prebuilt-android-fix-eval
android prebuilt: Fix eval
This commit is contained in:
commit
7f76da8f7a
|
@ -53,7 +53,8 @@ let
|
|||
dynamicLinker =
|
||||
/**/ if libc == null then null
|
||||
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.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"
|
||||
|
|
|
@ -298,7 +298,10 @@ stdenv.mkDerivation {
|
|||
# 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
|
||||
# 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
|
||||
''
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, buildPackages
|
||||
, buildPackages, pkgsHostHost
|
||||
, pkg-config, which, makeWrapper
|
||||
, zlib, bzip2, libpng, gnumake, glib
|
||||
|
||||
|
@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = glib.flattenInclude + ''
|
||||
substituteInPlace $dev/bin/freetype-config \
|
||||
--replace ${buildPackages.pkg-config} ${pkg-config}
|
||||
--replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config}
|
||||
|
||||
wrapProgram "$dev/bin/freetype-config" \
|
||||
--set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
|
||||
|
|
|
@ -24,7 +24,8 @@
|
|||
}:
|
||||
|
||||
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
|
||||
os = if stdenv.system == "x86_64-linux" then "linux"
|
||||
|
|
Loading…
Reference in a new issue