summary refs log tree commit diff
path: root/pkgs/stdenv/freebsd
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-05-27 07:49:55 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-05-27 07:49:55 +0000
commite21b6b6ee58077b235b998f85c6c9122c52dd465 (patch)
tree017bab49bb3fc85e1583564984cd064bbb209eae /pkgs/stdenv/freebsd
parent2ead4b20b52445ec3560c3d530e820ce5a05204a (diff)
downloadnixpkgs-e21b6b6ee58077b235b998f85c6c9122c52dd465.tar
nixpkgs-e21b6b6ee58077b235b998f85c6c9122c52dd465.tar.gz
nixpkgs-e21b6b6ee58077b235b998f85c6c9122c52dd465.tar.bz2
nixpkgs-e21b6b6ee58077b235b998f85c6c9122c52dd465.tar.lz
nixpkgs-e21b6b6ee58077b235b998f85c6c9122c52dd465.tar.xz
nixpkgs-e21b6b6ee58077b235b998f85c6c9122c52dd465.tar.zst
nixpkgs-e21b6b6ee58077b235b998f85c6c9122c52dd465.zip
* 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
Diffstat (limited to 'pkgs/stdenv/freebsd')
-rw-r--r--pkgs/stdenv/freebsd/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 22e223ca6cc..b1ca853c612 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -17,7 +17,8 @@ genericStdenv {
 
   shell = "/bin/bash";
 
-  extraAttrs = {
+  fetchurlBoot = import ../../build-support/fetchurl {
+    inherit stdenv;
     # Curl should be in /usr/bin or so.
     curl = null;
   };