From 5168fde6a6bfb1b4228ad409c2373f6861a6c9ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Sep 2008 11:33:46 +0000
Subject: [PATCH] * 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
---
 pkgs/development/libraries/pcre/7.8.nix     | 14 ++++++++++++++
 pkgs/development/libraries/pcre/default.nix |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/pcre/7.8.nix

diff --git a/pkgs/development/libraries/pcre/7.8.nix b/pkgs/development/libraries/pcre/7.8.nix
new file mode 100644
index 00000000000..a9afb0c7cef
--- /dev/null
+++ b/pkgs/development/libraries/pcre/7.8.nix
@@ -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 "");
+}
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index a9afb0c7cef..6baea4b6ff5 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -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