* Revert to 7.4 (but with an updated URL) since pcre is a part of

stdenv.  Time to reopen the stdenv branch?

svn path=/nixpkgs/trunk/; revision=12838
This commit is contained in:
Eelco Dolstra 2008-09-10 11:33:46 +00:00
parent 884b8c42d3
commit 5168fde6a6
2 changed files with 17 additions and 3 deletions

View File

@ -0,0 +1,14 @@
{stdenv, fetchurl, unicodeSupport ? false, cplusplusSupport ? true}:
stdenv.mkDerivation {
name = "pcre-7.8";
src = fetchurl {
url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.8.tar.bz2;
sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr";
};
configureFlags =
(if unicodeSupport then
"--enable-unicode-properties --enable-shared --disable-static"
else "") +
(if !cplusplusSupport then "--disable-cpp" else "");
}

View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, unicodeSupport ? false, cplusplusSupport ? true}:
stdenv.mkDerivation {
name = "pcre-7.8";
name = "pcre-7.4";
src = fetchurl {
url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.8.tar.bz2;
sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr";
url = mirror://sourceforge/pcre/pcre-7.4.tar.bz2;
sha256 = "1rdks2h5f3p2d71c4jnxaic1c9gmgsfky80djnafcdbdrhzkiyx5";
};
configureFlags =
(if unicodeSupport then