* Glibc updated to 2.3.5.
* GCC 3.4.4 and 3.3.6. * Other stdenv packages updated. svn path=/nixpkgs/trunk/; revision=3188
This commit is contained in:
@@ -1,12 +1,14 @@
|
||||
{stdenv, fetchurl, zlib}:
|
||||
{stdenv, fetchurl, zlib, sslSupport ? false, openssl ? null}:
|
||||
|
||||
assert sslSupport -> openssl != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "curl-7.12.0";
|
||||
name = "curl-7.14.0";
|
||||
src = fetchurl {
|
||||
url = http://losser.st-lab.cs.uu.nl/~armijn/.nix//curl-7.12.0.tar.bz2;
|
||||
md5 = "47db6619b849600ba2771074f00da517";
|
||||
url = http://curl.haxx.se/download/curl-7.14.0.tar.bz2;
|
||||
md5 = "46ce665e47d37fce1a0bad935cce58a9";
|
||||
};
|
||||
buildInputs = [zlib];
|
||||
buildInputs = [zlib (if sslSupport then openssl else null)];
|
||||
patches = [./configure-cxxcpp.patch];
|
||||
configureFlags = "--without-ssl";
|
||||
configureFlags = (if sslSupport then "--with-ssl" else "--without-ssl");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user