summary refs log tree commit diff
path: root/pkgs/development/libraries/apr
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/apr')
-rw-r--r--pkgs/development/libraries/apr/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 728ec87a1ce60..2d51706e9f77f 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -20,6 +20,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 ];