* Compatibility hack for building the ISO on Nix <= 0.11.
svn path=/nixos/trunk/; revision=10080
This commit is contained in:
parent
7ea8d224f4
commit
af75f317a4
|
@ -49,7 +49,7 @@ rec {
|
||||||
job = "
|
job = "
|
||||||
start on udev
|
start on udev
|
||||||
stop on shutdown
|
stop on shutdown
|
||||||
respawn ${pkgs.w3m}/bin/w3m ${import ../doc/manual}/manual.html < /dev/tty7 > /dev/tty7 2>&1
|
respawn ${pkgs.w3m}/bin/w3m ${manual} < /dev/tty7 > /dev/tty7 2>&1
|
||||||
";
|
";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -126,6 +126,14 @@ rec {
|
||||||
pkgs = system.pkgs;
|
pkgs = system.pkgs;
|
||||||
|
|
||||||
|
|
||||||
|
# The NixOS manual, with a backward compatibility hack for Nix <=
|
||||||
|
# 0.11 (you won't get the manual).
|
||||||
|
manual =
|
||||||
|
if builtins ? unsafeDiscardStringContext
|
||||||
|
then "${import ../doc/manual}/manual.html"
|
||||||
|
else pkgs.writeText "dummy-manual" "Manual not included in this build!";
|
||||||
|
|
||||||
|
|
||||||
# Since the CD is read-only, the mount points must be on disk.
|
# Since the CD is read-only, the mount points must be on disk.
|
||||||
cdMountPoints = pkgs.runCommand "mount-points" {} "
|
cdMountPoints = pkgs.runCommand "mount-points" {} "
|
||||||
ensureDir $out
|
ensureDir $out
|
||||||
|
|
Loading…
Reference in New Issue