Merge pull request #134403 from womfoo/fix/armv7l-sd_image

nixos/sd_image: fix armv7l build
This commit is contained in:
Jörg Thalheim
2021-08-17 12:06:13 +01:00
committed by GitHub
3 changed files with 6 additions and 2 deletions

View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = lib.optional fixedPoint "--enable-fixed-point"
++ lib.optional withCustomModes "--enable-custom-modes";
doCheck = !stdenv.isi686; # test_unit_LPC_inv_pred_gain fails
doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails
meta = with lib; {
description = "Open, royalty-free, highly versatile audio codec";

View File

@@ -139,6 +139,9 @@ stdenv.mkDerivation rec {
++ optional (!enablePam) "--without-pam"
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"--bundled-libraries=!asn1_compile,!compile_et"
] ++ optional stdenv.isAarch32 [
# https://bugs.gentoo.org/683148
"--jobs 1"
];
# python-config from build Python gives incorrect values when cross-compiling.

View File

@@ -112,7 +112,8 @@ stdenv.mkDerivation (rec {
# and {Open,Free}BSD.
# With non-standard storeDir: https://github.com/NixOS/nix/issues/512
doCheck = stdenv.hostPlatform == stdenv.buildPlatform
&& (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl);
&& (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl)
&& !stdenv.isAarch32;
# Prevents attempts of running 'help2man' on cross-built binaries.
PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing";