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

apr: Split into multiple outputs

Browse Source 
This is important because apr stores a copy of libtool, which in turn
contains a reference to GCC.
This commit is contained in:
Eelco Dolstra 2013-06-13 11:32:55 +02:00
parent f9523bf1e8
commit edff23e591
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/apr-util/default.nix
View File

@ -19,11 +19,13 @@ stdenv.mkDerivation rec {
configureFlags = '' configureFlags = ''
--with-apr=${apr} --with-expat=${expat} --with-apr=${apr} --with-expat=${expat}
--with-crypto --with-crypto
${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"} ${stdenv.lib.optionalString sslSupport "--with-openssl"}
${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db4}"} ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db4}"}
${stdenv.lib.optionalString ldapSupport "--with-ldap"} ${stdenv.lib.optionalString ldapSupport "--with-ldap"}
''; '';
buildInputs = stdenv.lib.optional sslSupport openssl;
propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap; propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap;
enableParallelBuilding = true; enableParallelBuilding = true;

16
pkgs/development/libraries/apr/default.nix
View File

@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ]; patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
outputs = [ "dev" "out" ];
preConfigure =
''
configureFlagsArray+=("--with-installbuilddir=$dev/share/build")
'';
configureFlags = configureFlags =
# Don't use accept4 because it's only supported on Linux >= 2.6.28. # Don't use accept4 because it's only supported on Linux >= 2.6.28.
[ "apr_cv_accept4=no" ] [ "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 # 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;
postInstall =
''
mkdir $dev/bin $dev/lib
mv $out/bin/apr-1-config $dev/bin
mv $out/lib/pkgconfig $dev/lib
'';
meta = { meta = {
homepage = http://apr.apache.org/; homepage = http://apr.apache.org/;
description = "The Apache Portable Runtime library"; description = "The Apache Portable Runtime library";

4
pkgs/top-level/all-packages.nix
View File

@ -3544,7 +3544,9 @@ let
amrwb = callPackage ../development/libraries/amrwb { }; amrwb = callPackage ../development/libraries/amrwb { };
apr = callPackage ../development/libraries/apr { }; apr = callPackage ../development/libraries/apr {
stdenv = stdenvMulti;
};
aprutil = callPackage ../development/libraries/apr-util { aprutil = callPackage ../development/libraries/apr-util {
bdbSupport = true; bdbSupport = true;