diff options
author | John Ericson <mail@JohnEricson.me> | 2018-08-31 09:56:10 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-31 09:56:10 -0400 |
commit | 2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93 (patch) | |
tree | 46c1a6242a2243d6d6bd04d0dcb234056bc01c14 /pkgs/os-specific/linux/uclibc/default.nix | |
parent | f7606a82ed6bbf93c015c01b4067c7529ab3e74e (diff) | |
parent | 0828e2d8c369604c56219bd7085256b984087280 (diff) | |
download | nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.gz nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.bz2 nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.lz nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.xz nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.zst nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.zip |
Merge pull request #45820 from obsidiansystems/dont-use-obsolete-platform-aliases
treewide: Dont use obsolete platform aliases
Diffstat (limited to 'pkgs/os-specific/linux/uclibc/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/uclibc/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 3da12c41dc12..de1e47faf666 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -1,6 +1,5 @@ { stdenv, buildPackages , fetchurl, linuxHeaders, libiconvReal -, buildPlatform, hostPlatform , extraConfig ? "" }: @@ -40,7 +39,7 @@ let UCLIBC_SUSV4_LEGACY y UCLIBC_HAS_THREADS_NATIVE y KERNEL_HEADERS "${linuxHeaders}/include" - '' + stdenv.lib.optionalString (stdenv.isAarch32 && buildPlatform != hostPlatform) '' + '' + stdenv.lib.optionalString (stdenv.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' CONFIG_ARM_EABI y ARCH_WANTS_BIG_ENDIAN n ARCH_BIG_ENDIAN n @@ -69,7 +68,7 @@ stdenv.mkDerivation { cat << EOF | parseconfig ${nixConfig} ${extraConfig} - ${hostPlatform.platform.uclibc.extraConfig or ""} + ${stdenv.hostPlatform.platform.uclibc.extraConfig or ""} EOF ( set +o pipefail; yes "" | make oldconfig ) ''; @@ -82,7 +81,7 @@ stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; makeFlags = [ - "ARCH=${hostPlatform.parsed.cpu.name}" + "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" "VERBOSE=1" ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CROSS=${stdenv.cc.targetPrefix}" |