diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-02 17:05:23 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-01-03 10:16:11 +0100 |
| commit | 016111e839ec15e23c080da8ff955a548155202c (patch) | |
| tree | b7b84b102c8b1faa5163a8fadcb8d7848466c16c /pkgs/development/libraries/apr | |
| parent | 960c24a99604bab584ca111493d307875777952f (diff) | |
| download | nixpkgs-016111e839ec15e23c080da8ff955a548155202c.tar nixpkgs-016111e839ec15e23c080da8ff955a548155202c.tar.gz nixpkgs-016111e839ec15e23c080da8ff955a548155202c.tar.bz2 nixpkgs-016111e839ec15e23c080da8ff955a548155202c.tar.lz nixpkgs-016111e839ec15e23c080da8ff955a548155202c.tar.xz nixpkgs-016111e839ec15e23c080da8ff955a548155202c.tar.zst nixpkgs-016111e839ec15e23c080da8ff955a548155202c.zip | |
apr: fix static musl build
Diffstat (limited to 'pkgs/development/libraries/apr')
| -rw-r--r-- | pkgs/development/libraries/apr/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index d9409636bd0..2ce4b77927f 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -23,10 +23,18 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--with-installbuilddir=$dev/share/build") ''; - configureFlags = + configureFlags = stdenv.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" + ] ++ stdenv.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 - stdenv.lib.optional (stdenv.hostPlatform.system == "i686-cygwin") "ac_cv_header_windows_h=no"; + "ac_cv_header_windows_h=no" + ]; + + CPPFLAGS=stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED"; enableParallelBuilding = true; |