diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-10-07 12:41:36 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-10-07 12:41:36 +0000 |
| commit | 19ebc883e177cc11d41f607e6ed013012f729b41 (patch) | |
| tree | d9d4d75ad7e37904c1a2613ab5907fcc7acdd589 /pkgs | |
| parent | a4b6f1066cda791fe61843189ec4da1499be0900 (diff) | |
| download | nixlib-19ebc883e177cc11d41f607e6ed013012f729b41.tar nixlib-19ebc883e177cc11d41f607e6ed013012f729b41.tar.gz nixlib-19ebc883e177cc11d41f607e6ed013012f729b41.tar.bz2 nixlib-19ebc883e177cc11d41f607e6ed013012f729b41.tar.lz nixlib-19ebc883e177cc11d41f607e6ed013012f729b41.tar.xz nixlib-19ebc883e177cc11d41f607e6ed013012f729b41.tar.zst nixlib-19ebc883e177cc11d41f607e6ed013012f729b41.zip | |
* pcre 7.8.
svn path=/nixpkgs/branches/stdenv-updates/; revision=12984
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/pcre/7.8.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/pcre/default.nix | 15 |
2 files changed, 7 insertions, 22 deletions
diff --git a/pkgs/development/libraries/pcre/7.8.nix b/pkgs/development/libraries/pcre/7.8.nix deleted file mode 100644 index a9afb0c7cefd..000000000000 --- a/pkgs/development/libraries/pcre/7.8.nix +++ /dev/null @@ -1,14 +0,0 @@ -{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 6baea4b6ff52..0ca141fc5287 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,14 +1,13 @@ {stdenv, fetchurl, unicodeSupport ? false, cplusplusSupport ? true}: stdenv.mkDerivation { - name = "pcre-7.4"; + name = "pcre-7.8"; src = fetchurl { - url = mirror://sourceforge/pcre/pcre-7.4.tar.bz2; - sha256 = "1rdks2h5f3p2d71c4jnxaic1c9gmgsfky80djnafcdbdrhzkiyx5"; + 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 ""); + configureFlags = '' + ${if unicodeSupport then "--enable-unicode-properties --enable-shared --disable-static" else ""} + ${if !cplusplusSupport then "--disable-cpp" else ""} + ''; } |