Merge pull request #103925 from lopsided98/coreutils-tests-arm

coreutils, findutils, gnutls: fix build on 32-bit ARM
2020-12-07 23:38:08 -03:00
parent e190f2723e f54266824d
commit 52242b4e7d
6 changed files with 147 additions and 5 deletions
@@ -34,7 +34,10 @@ stdenv.mkDerivation {

  patches = [ ./nix-ssl-cert-file.patch ]
    # Disable native add_system_trust.
-    ++ lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch;
+    ++ lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch
+    # fix gnulib tests on 32-bit ARM. Included on gnutls master.
+    # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch;

  # Skip some tests:
  #  - pkgconfig: building against the result won't work before installing (3.5.11)