diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-09-10 11:33:46 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-09-10 11:33:46 +0000 |
| commit | 5168fde6a6bfb1b4228ad409c2373f6861a6c9ad (patch) | |
| tree | 50c03cd51dd0a487a35679cab030ccadf60c135a | |
| parent | 884b8c42d32f98e7e4a752a8183cd9ae1b3d696e (diff) | |
| download | nixpkgs-5168fde6a6bfb1b4228ad409c2373f6861a6c9ad.tar nixpkgs-5168fde6a6bfb1b4228ad409c2373f6861a6c9ad.tar.gz nixpkgs-5168fde6a6bfb1b4228ad409c2373f6861a6c9ad.tar.bz2 nixpkgs-5168fde6a6bfb1b4228ad409c2373f6861a6c9ad.tar.lz nixpkgs-5168fde6a6bfb1b4228ad409c2373f6861a6c9ad.tar.xz nixpkgs-5168fde6a6bfb1b4228ad409c2373f6861a6c9ad.tar.zst nixpkgs-5168fde6a6bfb1b4228ad409c2373f6861a6c9ad.zip | |
* 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
| -rw-r--r-- | pkgs/development/libraries/pcre/7.8.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/pcre/default.nix | 6 |
2 files changed, 17 insertions, 3 deletions
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 |