public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into multiple-outputs

Browse Source 
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
This commit is contained in:
Eelco Dolstra
2013-08-21 17:05:30 +02:00
parent 9555f3ba06 77b9f28658
commit 10cb4a8cf2
1087 changed files with 30296 additions and 32019 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/apr/default.nix
+3 -5
View File
@@ -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;