From 11f838c363574144c64f57c01bae40fc55c11e32 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Apr 2004 14:17:47 +0000 Subject: [PATCH] * Add dependency on Curl. svn path=/nixpkgs/trunk/; revision=931 --- pkgs/misc/nix/default.nix | 4 ++-- pkgs/system/all-packages-generic.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix index 1bf71fcf507..35fae3fbab9 100644 --- a/pkgs/misc/nix/default.nix +++ b/pkgs/misc/nix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, aterm, bdb, perl +{ stdenv, fetchurl, aterm, bdb, perl, curl , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: @@ -14,6 +14,6 @@ stdenv.mkDerivation { url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.5pre927/nix-0.5pre927.tar.bz2; md5 = "57d71f86718ba8e75a5ed16a302fcf39"; }; - buildInputs = [aterm bdb perl]; + buildInputs = [aterm bdb perl curl]; inherit storeDir stateDir aterm bdb; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 348167acafb..308a634e735 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -634,6 +634,7 @@ rec { nix = (import ../misc/nix) { inherit fetchurl stdenv aterm perl; + curl = bootCurl; /* !!! ugly */ bdb = db4; };