From ba6411ddcb1749e83053f320eec34f714dbbd41e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 12 Nov 2021 18:55:57 +0000
Subject: [PATCH 1/3] apr: fix cross

---
 pkgs/development/libraries/apr/default.nix | 16 +++++++++++-----
 pkgs/top-level/all-packages.nix            |  4 +++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 19adfb08cfa0..728ec87a1ce6 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }:
+{ lib, stdenv, fetchurl, fetchpatch, buildPackages, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "apr";
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
       # convince fetchpatch to restore missing `a/`, `b/` to paths
       extraPrefix = "";
     })
+
+    # Fix cross.
+    (fetchpatch {
+      url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch";
+      sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm";
+    })
   ] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
 
   # This test needs the net
@@ -35,8 +41,8 @@ stdenv.mkDerivation rec {
   configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_file__dev_zero=yes"
     "ac_cv_func_setpgrp_void=0"
-    "apr_cv_process_shared_works=1"
     "apr_cv_tcp_nodelay_with_cork=1"
+    "CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc"
   ] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [
     # Including the Windows headers breaks unistd.h.
     # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
@@ -45,9 +51,9 @@ stdenv.mkDerivation rec {
 
   CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED";
 
-  nativeBuildInputs =
-    # Update libtool for macOS 11 support
-    lib.optional (stdenv.isDarwin && stdenv.isAarch64) [ autoreconfHook ];
+  # - Update libtool for macOS 11 support
+  # - Regenerate for cross fix patch
+  nativeBuildInputs = [ autoreconfHook ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de9cffab1173..6b45f107734e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15534,7 +15534,9 @@ with pkgs;
 
   appstream-glib = callPackage ../development/libraries/appstream-glib { };
 
-  apr = callPackage ../development/libraries/apr { };
+  apr = callPackage ../development/libraries/apr {
+    autoreconfHook = buildPackages.autoreconfHook269;
+  };
 
   aprutil = callPackage ../development/libraries/apr-util {
     db = if stdenv.isFreeBSD then db4 else db;

From 4099c1aecd683bf7e7ba99aba964f2f8e80b2755 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 12 Nov 2021 19:43:34 +0000
Subject: [PATCH 2/3] apr: backport patch so we can drop iovec hack

---
 pkgs/development/libraries/apr/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 728ec87a1ce6..2d51706e9f77 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
     })
 
     # Fix cross.
+    (fetchpatch {
+      url = "https://github.com/apache/apr/commit/374210c50ee9f4dbf265f0172dcf2d45b97d0550.patch";
+      sha256 = "04k62c5dh043jhkgs5qma6yqkq4q7nh0zswr81il4l7q1zil581y";
+    })
     (fetchpatch {
       url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch";
       sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm";
@@ -49,8 +53,6 @@ stdenv.mkDerivation rec {
     "ac_cv_header_windows_h=no"
   ];
 
-  CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED";
-
   # - Update libtool for macOS 11 support
   # - Regenerate for cross fix patch
   nativeBuildInputs = [ autoreconfHook ];

From aa32ae2e596ca2841a25d13562b6cb5c78c99bc2 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 12 Nov 2021 19:44:11 +0000
Subject: [PATCH 3/3] apr: run tests

---
 pkgs/development/libraries/apr/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 2d51706e9f77..0292fb223e7c 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -57,6 +57,8 @@ stdenv.mkDerivation rec {
   # - Regenerate for cross fix patch
   nativeBuildInputs = [ autoreconfHook ];
 
+  doCheck = true;
+
   enableParallelBuilding = true;
 
   meta = with lib; {