From debbb8a1997d1fa0a271923d96e44eda8906728f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 24 May 2009 20:30:02 +0000 Subject: [PATCH] Made example of configurable DVD working with aby common base dir for NixOS/NixPkgs/Nix/configurations checkout svn path=/nixos/trunk/; revision=15705 --- installer/cd-dvd/rescue-dvd.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/cd-dvd/rescue-dvd.nix b/installer/cd-dvd/rescue-dvd.nix index 8d0b62ce447a..c877ffa929bb 100644 --- a/installer/cd-dvd/rescue-dvd.nix +++ b/installer/cd-dvd/rescue-dvd.nix @@ -1,7 +1,7 @@ let - rescueCDFun = import /etc/nixos/nixos/installer/cd-dvd/rescue-cd.nix; - pkgs = import /etc/nixos/nixpkgs {}; - kernels = import /etc/nixos/configurations/misc/raskin/kernel-options.nix {inherit pkgs;}; + rescueCDFun = import ./rescue-cd.nix; + pkgs = import ../../../nixpkgs {}; + kernels = import ../../../configurations/misc/raskin/kernel-options.nix {inherit pkgs;}; bootEntries = baseKernel: rec { kernelPackages = let shippedKernelPackages = pkgs.kernelPackagesFor (baseKernel); @@ -74,7 +74,7 @@ rescueCDFun { pkgs.tcl ]; - nix = pkgs.nixCustomFun ("" + /etc/nixos/nix + "/") + nix = pkgs.nixCustomFun ("" + ../../../nix + "/") "" ["nix-reduce-build" "nix-http-export.cgi"] ["--with-docbook-xsl=${pkgs.docbook5_xsl}/xml/xsl/docbook/"];