diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-21 17:05:30 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-21 17:05:30 +0200 |
| commit | 10cb4a8cf253744e4d200bd0befaff2907097574 (patch) | |
| tree | 4383356165c7f54dffaf3a852f54dd814101aaa7 /pkgs/development/libraries/apr | |
| parent | 9555f3ba068f2deeb433ac7989775f8e2c3494a1 (diff) | |
| parent | 77b9f286584e08f441357dba0e69676f0e9c4abc (diff) | |
Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libsndfile/default.nix
pkgs/misc/cups/default.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/apr')
| -rw-r--r-- | pkgs/development/libraries/apr/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 0a83741635e8..050ea96869f1 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { - name = "apr-1.4.6"; + name = "apr-1.4.8"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "ffee70a111fd07372982b0550bbb14b7"; + md5 = "ce2ab01a0c3cdb71cf0a6326b8654f41"; }; patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ]; @@ -22,11 +22,9 @@ stdenv.mkDerivation rec { ''; 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.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no"; + stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no"; enableParallelBuilding = true; |