commit 22255ddec41b459f7f480ab6422ad10d0c4a98b7 · pyrox.dev/nixpkgs

+31 -17
nixos/modules/installer/sd-card/sd-image.nix
···

       29
       29
        
         imports = [

     

       30
       30
        
           (mkRemovedOptionModule [ "sdImage" "bootPartitionID" ] "The FAT partition for SD image now only holds the Raspberry Pi firmware files. Use firmwarePartitionID to configure that partition's ID.")

     

       31
       31
        
           (mkRemovedOptionModule [ "sdImage" "bootSize" ] "The boot files for SD image have been moved to the main ext4 partition. The FAT partition now only holds the Raspberry Pi firmware files. Changing its size may not be required.")

     

       32
       32
       +
           (lib.mkRenamedOptionModuleWith {

     

       33
       33
       +
             sinceRelease = 2505;

     

       34
       34
       +
             from = [

     

       35
       35
       +
               "sdImage"

     

       36
       36
       +
               "imageBaseName"

     

       37
       37
       +
             ];

     

       38
       38
       +
             to = [

     

       39
       39
       +
               "image"

     

       40
       40
       +
               "baseName"

     

       41
       41
       +
             ];

     

       42
       42
       +
           })

     

       43
       43
       +
           (lib.mkRenamedOptionModuleWith {

     

       44
       44
       +
             sinceRelease = 2505;

     

       45
       45
       +
             from = [

     

       46
       46
       +
               "sdImage"

     

       47
       47
       +
               "imageName"

     

       48
       48
       +
             ];

     

       49
       49
       +
             to = [

     

       50
       50
       +
               "image"

     

       51
       51
       +
               "fileName"

     

       52
       52
       +
             ];

     

       53
       53
       +
           })

     

       54
       54
       +
           ../../profiles/all-hardware.nix

     

       55
       55
       +
           ../../image/file-options.nix

     

       32
       56
        
         ];

     

       33
       57
        
       

     

       34
       58
        
         options.sdImage = {

     

       35
       35
       -
           imageName = mkOption {

     

       36
       36
       -
             default = "${config.sdImage.imageBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.img";

     

       37
       37
       -
             description = ''

     

       38
       38
       -
               Name of the generated image file.

     

       39
       39
       -
             '';

     

       40
       40
       -
           };

     

       41
       41
       -
       

     

       42
       42
       -
           imageBaseName = mkOption {

     

       43
       43
       -
             default = "nixos-sd-image";

     

       44
       44
       -
             description = ''

     

       45
       45
       -
               Prefix of the name of the generated image file.

     

       46
       46
       -
             '';

     

       47
       47
       -
           };

     

       48
       48
       -
       

     

       49
       59
        
           storePaths = mkOption {

     

       50
       60
        
             type = with types; listOf package;

     

       51
       61
        
             example = literalExpression "[ pkgs.stdenv ]";

     
···

       180
       190
        
       

     

       181
       191
        
           sdImage.storePaths = [ config.system.build.toplevel ];

     

       182
       192
        
       

     

       193
       193
       +
           image.extension = if config.sdImage.compressImage then "img.zst" else "img";

     

       194
       194
       +
           image.filePath = "sd-card/${config.image.fileName}";

     

       195
       195
       +
           system.nixos.tags = [ "sd-card" ];

     

       196
       196
       +
           system.build.image = config.system.build.sdImage;

     

       183
       197
        
           system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs,

     

       184
       198
        
           mtools, libfaketime, util-linux, zstd }: stdenv.mkDerivation {

     

       185
       185
       -
             name = config.sdImage.imageName;

     

       199
       199
       +
             name = config.image.fileName;

     

       186
       200
        
       

     

       187
       201
        
             nativeBuildInputs = [ dosfstools e2fsprogs libfaketime mtools util-linux ]

     

       188
       202
        
             ++ lib.optional config.sdImage.compressImage zstd;

     

       189
       203
        
       

     

       190
       190
       -
             inherit (config.sdImage) imageName compressImage;

     

       204
       204
       +
             inherit (config.sdImage) compressImage;

     

       191
       205
        
       

     

       192
       206
        
             buildCommand = ''

     

       193
       207
        
               mkdir -p $out/nix-support $out/sd-image

     

       194
       194
       -
               export img=$out/sd-image/${config.sdImage.imageName}

     

       208
       208
       +
               export img=$out/sd-image/${config.image.baseName}.img

     

       195
       209
        
       

     

       196
       210
        
               echo "${pkgs.stdenv.buildPlatform.system}" > $out/nix-support/system

     

       197
       211
        
               if test -n "$compressImage"; then