* Revert last two commits, they should be in the stdenv-branch.
svn path=/nixpkgs/trunk/; revision=24075
This commit is contained in:
parent
dd6e852f3e
commit
d845bf6b8c
@ -8,18 +8,11 @@ stdenv.mkDerivation {
|
|||||||
sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr";
|
sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr";
|
||||||
};
|
};
|
||||||
|
|
||||||
# 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 = ''
|
configureFlags = ''
|
||||||
CPPFLAGS=-NDEBUG CFLAGS=-O3 CXXFLAGS=${if stdenv.isDarwin then "-O0" else "-O3"}
|
|
||||||
${if unicodeSupport then "--enable-unicode-properties" else ""}
|
${if unicodeSupport then "--enable-unicode-properties" else ""}
|
||||||
${if !cplusplusSupport then "--disable-cpp" else ""}
|
${if !cplusplusSupport then "--disable-cpp" else ""}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://www.pcre.org/";
|
homepage = "http://www.pcre.org/";
|
||||||
description = "A library for Perl Compatible Regular Expressions";
|
description = "A library for Perl Compatible Regular Expressions";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user