* curl: build with OpenSSL (https) support by default.
* Some fetchurl-related refactoring. The `realCurl' attribute is gone, `curl' is the real thing. To prevent an infinite recursion in `fetchurl' (because it depends on curl and building curl needs fetchurl), curl and its dependencies (openssl, zlib, perl) use `fetchurlBoot', which is the fetchurl used by the previous bootstrap phase (e.g. the statically linked version of curl for stdenv-linux). So as a result you can use https:// urls almost everywhere. There's also some hackery to prevent a different curl from being built in every stdenv-linux bootstrap phase (namely the stdenv.fetchurl attribute which allows fetchurl to be overriden everywhere). svn path=/nixpkgs/trunk/; revision=11905
This commit is contained in:
@@ -28,7 +28,7 @@ let
|
||||
|
||||
inherit (pkgsDiet)
|
||||
coreutils diffutils gnugrep
|
||||
gzip bzip2 gnumake bash patch binutils;
|
||||
gzip bzip2 gnumake bash patch binutils curl;
|
||||
|
||||
findutils = pkgsDiet.findutils4227; # 4.2.28 is broken
|
||||
|
||||
@@ -58,8 +58,6 @@ let
|
||||
profiledCompiler = true;
|
||||
};
|
||||
|
||||
curl = pkgsDiet.realCurl;
|
||||
|
||||
glibc = pkgs.glibc;
|
||||
|
||||
# The result should not contain any references (store paths) so
|
||||
|
||||
Reference in New Issue
Block a user