JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apr: backport patch so we can drop iovec hack

Browse Source
This commit is contained in:
Alyssa Ross 2021-11-12 19:43:34 +00:00
parent ba6411ddcb
commit 4099c1aecd
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/apr/default.nix
View File

@ -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 ];