From 1e947b7acd158357d33e5e5a6a951b837465ba37 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Mar 2009 21:10:53 +0000
Subject: [PATCH] svn path=/nixos/trunk/; revision=14478

---
 release.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/release.nix b/release.nix
index 24b70478748..4d6ee916b1c 100644
--- a/release.nix
+++ b/release.nix
@@ -1,3 +1,5 @@
+{ nixpkgs ? ../nixpkgs-wc }:
+
 let 
 
 
@@ -5,12 +7,11 @@ let
 
 
     tarball =
-      { nixosSrc ? {path = ./.; rev = 1234;}
-      , nixpkgs ? {path = ../nixpkgs-wc;}
+      { nixosSrc ? {outPath = ./.; rev = 1234;}
       , officialRelease ? false
       }:
 
-      with import nixpkgs.path {};
+      with import nixpkgs {};
 
       releaseTools.makeSourceTarball {
         name = "nixos-tarball";
@@ -34,23 +35,21 @@ let
 
     manual =
       { nixosSrc ? {path = ./.; rev = 1234;}
-      , nixpkgs ? {path = ../nixpkgs-wc;}
       , officialRelease ? false
       }:
 
       import "${nixosSrc.path}/doc/manual" {
-        nixpkgsPath = nixpkgs.path;
+        nixpkgsPath = nixpkgs.outPath;
       };
 
 
     iso = 
       { nixosSrc ? {path = ./.; rev = 1234;}
-      , nixpkgs ? {path = ../nixpkgs-wc;}
       , officialRelease ? false
       , system ? "i686-linux"
       }:
 
-      with import nixpkgs.path {inherit system;};
+      with import nixpkgs {inherit system;};
 
       let
 
@@ -59,7 +58,7 @@ let
         iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
           platform = system;
           compressImage = true;
-          nixpkgsPath = nixpkgs.path;
+          nixpkgsPath = nixpkgs.outPath;
           relName = "nixos-${version}";
         }).rescueCD;