commit be006eab1f3df27c405a02897d735768f180260f · pyrox.dev/nixpkgs

+2 -2

nixos/lib/make-iso9660-image.nix

···

       1
       1
       -
       { stdenv, closureInfo, xorriso, syslinux

     

       1
       1
       +
       { stdenv, closureInfo, xorriso, syslinux, libossp_uuid

     

       2
       2
        
       

     

       3
       3
        
       , # The file name of the resulting ISO image.

     

       4
       4
        
         isoName ? "cd.iso"

     
···

       48
       48
        
       stdenv.mkDerivation {

     

       49
       49
        
         name = isoName;

     

       50
       50
        
         builder = ./make-iso9660-image.sh;

     

       51
       51
       -
         buildInputs = [ xorriso syslinux zstd ];

     

       51
       51
       +
         buildInputs = [ xorriso syslinux zstd libossp_uuid ];

     

       52
       52
        
       

     

       53
       53
        
         inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable;

     

       54
       54

+5 -9

nixos/lib/make-iso9660-image.sh

···

       99
       99
        
       

     

       100
       100
        
       mkdir -p $out/iso

     

       101
       101
        
       

     

       102
       102
       +
       # daed2280-b91e-42c0-aed6-82c825ca41f3 is an arbitrary namespace, to prevent

     

       103
       103
       +
       # independent applications from generating the same UUID for the same value.

     

       104
       104
       +
       # (the chance of that being problematic seem pretty slim here, but that's how

     

       105
       105
       +
       # version-5 UUID's work)

     

       102
       106
        
       xorriso="xorriso

     

       107
       107
       +
        -boot_image any gpt_disk_guid=$(uuid -v 5 daed2280-b91e-42c0-aed6-82c825ca41f3 $out | tr -d -)

     

       103
       108
        
        -as mkisofs

     

       104
       109
        
        -iso-level 3

     

       105
       110
        
        -volid ${volumeID}

     
···

       117
       122
        
       "

     

       118
       123
        
       

     

       119
       124
        
       $xorriso -output $out/iso/$isoName

     

       120
       120
       -
       

     

       121
       121
       -
       if test -n "$usbBootable"; then

     

       122
       122
       -
           echo "Making image hybrid..."

     

       123
       123
       -
           if test -n "$efiBootable"; then

     

       124
       124
       -
               isohybrid --uefi $out/iso/$isoName

     

       125
       125
       -
           else

     

       126
       126
       -
               isohybrid $out/iso/$isoName

     

       127
       127
       -
           fi

     

       128
       128
       -
       fi

     

       129
       125
        
       

     

       130
       126
        
       if test -n "$compressImage"; then

     

       131
       127
        
           echo "Compressing image..."