pcre: Split into multiple outputs

This commit is contained in:
Eelco Dolstra 2013-06-11 15:28:30 +02:00
parent 5787ac6364
commit afebababac
3 changed files with 11 additions and 2 deletions

View file

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "5778a02535473c7ee7838ea598c19f451e63cf5eec0bf0307a688301c9078c3c";
};
outputs = [ "dev" "out" "bin" "doc" "man" ];
# The compiler on Darwin crashes with an internal error while building the
# C++ interface. Disabling optimizations on that platform remedies the
# problem. In case we ever update the Darwin GCC version, the exception for
@ -19,6 +21,12 @@ stdenv.mkDerivation rec {
doCheck = !stdenv.isCygwin; # XXX: test failure on Cygwin
postInstall =
''
mkdir $dev/bin
mv $bin/bin/pcre-config $dev/bin/
'';
meta = {
homepage = "http://www.pcre.org/";
description = "A library for Perl Compatible Regular Expressions";

View file

@ -286,7 +286,7 @@ rec {
extraAttrs = {
inherit (stdenvLinuxBoot3Pkgs) glibc;
inherit platform bootstrapTools;
shellPackage = stdenvLinuxBoot4Pkgs.bash;
shellPackage = stdenvLinuxBoot4Pkgs.bash;
};
overrides = pkgs: {
@ -295,7 +295,7 @@ rec {
inherit (stdenvLinuxBoot4Pkgs)
gzip bzip2 xz bash coreutils diffutils findutils gawk
gnumake gnused gnutar gnugrep gnupatch patchelf
attr acl;
attr acl pcre;
};
};

View file

@ -4960,6 +4960,7 @@ let
};
pcre = callPackage ../development/libraries/pcre {
stdenv = stdenvMulti;
unicodeSupport = config.pcre.unicode or true;
};