From 84854877270823cad9b8be0331c92cc90425d123 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 17:52:02 +0200
Subject: [PATCH] Get rid of <nixpkgs>

---
 nixos/modules/installer/cd-dvd/channel.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index 987b85d61656..c6e0f1577bb1 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -14,10 +14,7 @@ let
     { expr = builtins.readFile ../../../lib/channel-expr.nix; }
     ''
       mkdir -p $out/nixos
-      # FIXME: should use ../../../.. instead of <nixpkgs>, but that
-      # doesn't work properly if <nixos> is a symlink to
-      # nixpkgs/nixos.
-      cp -prd ${<nixpkgs>} $out/nixos/nixpkgs
+      cp -prd ${pkgs.path} $out/nixos/nixpkgs
       ln -s nixpkgs/nixos $out/nixos/nixos
       chmod -R u+w $out/nixos
       rm -rf $out/nixos/nixpkgs/.git