diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-11 15:28:30 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-11 15:28:30 +0200 |
| commit | afebababacee7b75f7a13e3438d8583936569ba9 (patch) | |
| tree | b95f507f83b6c70c382e7f27482279b134f1c4e5 /pkgs | |
| parent | 5787ac63649e4e3f11b70f44fa66c7b304956c86 (diff) | |
| download | nixpkgs-afebababacee7b75f7a13e3438d8583936569ba9.tar nixpkgs-afebababacee7b75f7a13e3438d8583936569ba9.tar.gz nixpkgs-afebababacee7b75f7a13e3438d8583936569ba9.tar.bz2 nixpkgs-afebababacee7b75f7a13e3438d8583936569ba9.tar.lz nixpkgs-afebababacee7b75f7a13e3438d8583936569ba9.tar.xz nixpkgs-afebababacee7b75f7a13e3438d8583936569ba9.tar.zst nixpkgs-afebababacee7b75f7a13e3438d8583936569ba9.zip | |
pcre: Split into multiple outputs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/pcre/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index e59c249348a..d7d13c6de4c 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -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"; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 84af23a263c..44f5ff6ab30 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -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; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 153504507c2..d9475684a25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4960,6 +4960,7 @@ let }; pcre = callPackage ../development/libraries/pcre { + stdenv = stdenvMulti; unicodeSupport = config.pcre.unicode or true; }; |