summary refs log tree commit diff
path: root/pkgs/development/libraries/apr
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-02-10 13:30:57 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-02-10 13:30:57 +0000
commit31b1ba6b113e36b327d599086cde3ac87e33ff97 (patch)
treef4f6730f499d1acf0b5ba55e9f02d4550b84388c /pkgs/development/libraries/apr
parent7e7218cf80f0daf10da92bf131d6c87533867c36 (diff)
downloadnixpkgs-31b1ba6b113e36b327d599086cde3ac87e33ff97.tar
nixpkgs-31b1ba6b113e36b327d599086cde3ac87e33ff97.tar.gz
nixpkgs-31b1ba6b113e36b327d599086cde3ac87e33ff97.tar.bz2
nixpkgs-31b1ba6b113e36b327d599086cde3ac87e33ff97.tar.lz
nixpkgs-31b1ba6b113e36b327d599086cde3ac87e33ff97.tar.xz
nixpkgs-31b1ba6b113e36b327d599086cde3ac87e33ff97.tar.zst
nixpkgs-31b1ba6b113e36b327d599086cde3ac87e33ff97.zip
* apr: don't use accept4(), because it's not support on Linux <
  2.6.28.  It's rather unfortunate that the result of building apr
  depends on the capabilities of the kernel on which it's built...

svn path=/nixpkgs/trunk/; revision=19903
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 9f28485754a..1e9e292cc49 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -2,16 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "apr-1.3.9";
-  
+
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
     sha256 = "1qicxnk62d9mjza8vch2wxy4xlq8sa76chwi5cp6bs4cyj9s61ap";
   };
 
   configureFlags =
+    # Don't use accept4 because it's only supported on Linux >= 2.6.28.
+    [ " apr_cv_accept4=no" ]
     # 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.optionalString (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no";
+    ++ stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no";
   
   meta = {
     homepage = http://apr.apache.org/;