Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 960c24a99604
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 016111e839ec
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 3, 2020

  1. apr: fix static musl build

    @FRidh
    FRidh committed Jan 3, 2020
    Copy the full SHA
    016111e View commit details
Showing with 10 additions and 2 deletions.
  1. +10 −2 pkgs/development/libraries/apr/default.nix
12 changes: 10 additions & 2 deletions pkgs/development/libraries/apr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;