diff options
| author | Marco Maggesi <maggesi@math.unifi.it> | 2012-06-06 21:44:20 +0000 |
|---|---|---|
| committer | Marco Maggesi <maggesi@math.unifi.it> | 2012-06-06 21:44:20 +0000 |
| commit | 93f41f5ad35b0f0d110bb537d178de78d5d13b47 (patch) | |
| tree | 30904f7738b24534bdeeaab20b2e18e4fc482a2b /pkgs/development/libraries/apr | |
| parent | cadc02cb2b101437dac600aeb1243d4671ef778d (diff) | |
| download | nixlib-93f41f5ad35b0f0d110bb537d178de78d5d13b47.tar nixlib-93f41f5ad35b0f0d110bb537d178de78d5d13b47.tar.gz nixlib-93f41f5ad35b0f0d110bb537d178de78d5d13b47.tar.bz2 nixlib-93f41f5ad35b0f0d110bb537d178de78d5d13b47.tar.lz nixlib-93f41f5ad35b0f0d110bb537d178de78d5d13b47.tar.xz nixlib-93f41f5ad35b0f0d110bb537d178de78d5d13b47.tar.zst nixlib-93f41f5ad35b0f0d110bb537d178de78d5d13b47.zip | |
Fix build of apr on darwin
svn path=/nixpkgs/trunk/; revision=34374
Diffstat (limited to 'pkgs/development/libraries/apr')
| -rw-r--r-- | pkgs/development/libraries/apr/darwin_fix_configure.patch | 17 | ||||
| -rw-r--r-- | pkgs/development/libraries/apr/default.nix | 6 |
2 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/development/libraries/apr/darwin_fix_configure.patch b/pkgs/development/libraries/apr/darwin_fix_configure.patch new file mode 100644 index 000000000000..84d3f2078700 --- /dev/null +++ b/pkgs/development/libraries/apr/darwin_fix_configure.patch @@ -0,0 +1,17 @@ +diff -Nuar apr-1.4.6/configure apr-1.4.6-darwin-fix-configure/configure +--- apr-1.4.6/configure 2012-02-08 00:17:57.000000000 +0100 ++++ apr-1.4.6-darwin-fix-configure/configure 2012-06-06 23:08:56.000000000 +0200 +@@ -6854,10 +6854,10 @@ + *-apple-darwin*) + + if test "x$CPPFLAGS" = "x"; then +- test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp\"" +- CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp" ++ test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK\"" ++ CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK" + else +- apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp" ++ apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $CPPFLAGS; do diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index a0b9017d35fe..8c3d5c03496e 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchurl }: +let + inherit (stdenv.lib) optionals; +in + stdenv.mkDerivation rec { name = "apr-1.4.6"; @@ -8,6 +12,8 @@ stdenv.mkDerivation rec { md5 = "ffee70a111fd07372982b0550bbb14b7"; }; + patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ]; + configureFlags = # Don't use accept4 because it's only supported on Linux >= 2.6.28. [ "apr_cv_accept4=no" ] |