* Use cdrkit instead of cdrtools.
svn path=/nixos/trunk/; revision=10073
This commit is contained in:
parent
f4399a1883
commit
f499a74998
|
@ -156,7 +156,7 @@ rec {
|
|||
# Create an ISO image containing the Grub boot loader, the kernel,
|
||||
# the initrd produced above, and the closure of the stage 2 init.
|
||||
rescueCD = import ../helpers/make-iso9660-image.nix {
|
||||
inherit (pkgs) stdenv perl cdrtools;
|
||||
inherit (pkgs) stdenv perl cdrkit;
|
||||
isoName = "nixos-${platform}.iso";
|
||||
|
||||
# Single files to be copied to fixed locations on the CD.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, perl, cdrtools
|
||||
{ stdenv, perl, cdrkit
|
||||
|
||||
# The file name of the resulting ISO image.
|
||||
, isoName ? "cd.iso"
|
||||
|
@ -32,7 +32,7 @@ assert bootable -> bootImage != "";
|
|||
stdenv.mkDerivation {
|
||||
name = "iso9660-image";
|
||||
builder = ./make-iso9660-image.sh;
|
||||
buildInputs = [perl cdrtools];
|
||||
buildInputs = [perl cdrkit];
|
||||
inherit isoName bootable bootImage;
|
||||
|
||||
# !!! should use XML.
|
||||
|
|
|
@ -58,7 +58,7 @@ done
|
|||
|
||||
# !!! -f is a quick hack.
|
||||
ensureDir $out/iso
|
||||
mkisofs -r -J -o $out/iso/$isoName $bootFlags \
|
||||
genisoimage -r -J -o $out/iso/$isoName $bootFlags \
|
||||
-graft-points $graftList
|
||||
|
||||
ensureDir $out/nix-support
|
||||
|
|
Loading…
Reference in a new issue