diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-13 11:32:55 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-13 11:32:55 +0200 |
| commit | edff23e5916561898e09414cc8787fc639327f50 (patch) | |
| tree | 7cf27ab5a427084b651998f71e005e0a3ffea427 /pkgs/development/libraries/apr | |
| parent | f9523bf1e859fc595d4f2800696786df8ea20ee4 (diff) | |
apr: Split into multiple outputs
This is important because apr stores a copy of libtool, which in turn
contains a reference to GCC.
Diffstat (limited to 'pkgs/development/libraries/apr')
| -rw-r--r-- | pkgs/development/libraries/apr/default.nix | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 07a565596bbc..0a83741635e8 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -14,6 +14,13 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ]; + outputs = [ "dev" "out" ]; + + preConfigure = + '' + configureFlagsArray+=("--with-installbuilddir=$dev/share/build") + ''; + configureFlags = # Don't use accept4 because it's only supported on Linux >= 2.6.28. [ "apr_cv_accept4=no" ] @@ -21,6 +28,15 @@ stdenv.mkDerivation rec { # 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"; + enableParallelBuilding = true; + + postInstall = + '' + mkdir $dev/bin $dev/lib + mv $out/bin/apr-1-config $dev/bin + mv $out/lib/pkgconfig $dev/lib + ''; + meta = { homepage = http://apr.apache.org/; description = "The Apache Portable Runtime library"; |