From cbe4c2e0b879860fdf406ab2e039e0aeb2237257 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 21:19:06 +0000
Subject: [PATCH] * Installer: pull the manifest properly.

svn path=/nixos/trunk/; revision=7594
---
 configuration/rescue-cd.nix | 12 ++++++++----
 system/options.nix          | 11 +++++++++++
 system/system.nix           |  1 +
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 2fd1f0b9945..dc7fb066caa 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -1,6 +1,9 @@
 rec {
 
   
+  nixpkgsRel = "nixpkgs-0.11pre7577";
+
+
   configuration = {
   
     boot = {
@@ -45,6 +48,10 @@ rec {
       };
       
     };
+
+    installer = {
+      nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
+    };
     
   };
 
@@ -85,11 +92,8 @@ rec {
 
 
   # Get a recent copy of Nixpkgs.
-  nixpkgsRel = "nixpkgs-0.11pre7577";
-  nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
-
   nixpkgsTarball = pkgs.fetchurl {
-    url = nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
+    url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
     md5 = "0949415aa342679f206fdb7ee9b04b46";
   };
 
diff --git a/system/options.nix b/system/options.nix
index a1420c7037a..21c2c7b2493 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -485,4 +485,15 @@
   }
 
   
+  {
+    name = ["installer" "nixpkgsURL"];
+    default = "";
+    example = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7577;
+    description = "
+      URL of the Nixpkgs distribution to use when building the
+      installation CD.
+    ";
+  }
+
+  
 ]
diff --git a/system/system.nix b/system/system.nix
index a45f08c7e9f..acd8225d732 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -106,6 +106,7 @@ rec {
   nixosInstaller = import ../installer/nixos-installer.nix {
     inherit (pkgs) stdenv runCommand substituteAll;
     inherit nix;
+    nixpkgsURL = config.get ["installer" "nixpkgsURL"];
   };