Made example of configurable DVD working with aby common base dir for NixOS/NixPkgs/Nix/configurations checkout

svn path=/nixos/trunk/; revision=15705
This commit is contained in:
Michael Raskin 2009-05-24 20:30:02 +00:00
parent 575631b72a
commit debbb8a199

View File

@ -1,7 +1,7 @@
let let
rescueCDFun = import /etc/nixos/nixos/installer/cd-dvd/rescue-cd.nix; rescueCDFun = import ./rescue-cd.nix;
pkgs = import /etc/nixos/nixpkgs {}; pkgs = import ../../../nixpkgs {};
kernels = import /etc/nixos/configurations/misc/raskin/kernel-options.nix {inherit pkgs;}; kernels = import ../../../configurations/misc/raskin/kernel-options.nix {inherit pkgs;};
bootEntries = baseKernel: rec { bootEntries = baseKernel: rec {
kernelPackages = let kernelPackages = let
shippedKernelPackages = pkgs.kernelPackagesFor (baseKernel); shippedKernelPackages = pkgs.kernelPackagesFor (baseKernel);
@ -74,7 +74,7 @@ rescueCDFun {
pkgs.tcl pkgs.tcl
]; ];
nix = pkgs.nixCustomFun ("" + /etc/nixos/nix + "/") nix = pkgs.nixCustomFun ("" + ../../../nix + "/")
"" ""
["nix-reduce-build" "nix-http-export.cgi"] ["nix-reduce-build" "nix-http-export.cgi"]
["--with-docbook-xsl=${pkgs.docbook5_xsl}/xml/xsl/docbook/"]; ["--with-docbook-xsl=${pkgs.docbook5_xsl}/xml/xsl/docbook/"];