diff options
author | Peter Simons <simons@cryp.to> | 2010-10-05 13:57:31 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2010-10-05 13:57:31 +0000 |
commit | d61c959049751d6e5ab2b45aff0d44c4059fab56 (patch) | |
tree | 3650a0ac2d26d03051df5d5371a1726838f6f160 /pkgs/development/libraries/pcre | |
parent | 1171bb1dcaa8c57bc983093ccef7acc770e64ba2 (diff) |
pkgs/development/libraries/pcre: merged recent changes from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24076
Diffstat (limited to 'pkgs/development/libraries/pcre')
-rw-r--r-- | pkgs/development/libraries/pcre/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index faa8295c39230..141c06f00b8d0 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -8,11 +8,18 @@ stdenv.mkDerivation { sha256 = "7ac4e016f6bad8c7d990e6de9bce58c04ff5dd8838be0c5ada0afad1d6a07480"; }; + # 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 + # that platform ought to be removed. configureFlags = '' + CPPFLAGS=-NDEBUG CFLAGS=-O3 CXXFLAGS=${if stdenv.isDarwin then "-O0" else "-O3"} ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} ''; + doCheck = true; + meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; |