public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Use cdrkit instead of cdrtools.

Browse Source 
svn path=/nixos/trunk/; revision=10073
This commit is contained in:
Eelco Dolstra 2008-01-04 15:17:54 +00:00
parent f4399a1883
commit f499a74998
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration/rescue-cd.nix
View File

@ -156,7 +156,7 @@ rec {
# Create an ISO image containing the Grub boot loader, the kernel, # Create an ISO image containing the Grub boot loader, the kernel,
# the initrd produced above, and the closure of the stage 2 init. # the initrd produced above, and the closure of the stage 2 init.
rescueCD = import ../helpers/make-iso9660-image.nix { rescueCD = import ../helpers/make-iso9660-image.nix {
inherit (pkgs) stdenv perl cdrtools; inherit (pkgs) stdenv perl cdrkit;
isoName = "nixos-${platform}.iso"; isoName = "nixos-${platform}.iso";
# Single files to be copied to fixed locations on the CD. # Single files to be copied to fixed locations on the CD.

4
helpers/make-iso9660-image.nix
View File

@ -1,4 +1,4 @@
{ stdenv, perl, cdrtools { stdenv, perl, cdrkit
# The file name of the resulting ISO image. # The file name of the resulting ISO image.
, isoName ? "cd.iso" , isoName ? "cd.iso"
@ -32,7 +32,7 @@ assert bootable -> bootImage != "";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "iso9660-image"; name = "iso9660-image";
builder = ./make-iso9660-image.sh; builder = ./make-iso9660-image.sh;
buildInputs = [perl cdrtools]; buildInputs = [perl cdrkit];
inherit isoName bootable bootImage; inherit isoName bootable bootImage;
# !!! should use XML. # !!! should use XML.

2
helpers/make-iso9660-image.sh
View File

@ -58,7 +58,7 @@ done
# !!! -f is a quick hack. # !!! -f is a quick hack.
ensureDir $out/iso ensureDir $out/iso
mkisofs -r -J -o $out/iso/$isoName $bootFlags \ genisoimage -r -J -o $out/iso/$isoName $bootFlags \
-graft-points $graftList -graft-points $graftList
ensureDir $out/nix-support ensureDir $out/nix-support