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

singularity-tools.buildImages: use writeClosure

This commit is contained in:
Yueh-Shun Li 2024-03-15 08:33:22 +08:00
parent e28ad1a0a3
commit 5c1a3b619d
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/build-support/singularity-tools/default.nix
View File

@ -4,7 +4,7 @@
, storeDir ? builtins.storeDir
, writeScript
, singularity
, writeReferencesToFile
, writeClosure
, bash
, vmTools
, gawk
@ -50,18 +50,13 @@ rec {
}:
let
projectName = singularity.projectName or "singularity";
layer = mkLayer {
inherit name;
contents = contents ++ [ bash runScriptFile ];
inherit projectName;
};
runAsRootFile = shellScript "run-as-root.sh" runAsRoot;
runScriptFile = shellScript "run-script.sh" runScript;
result = vmTools.runInLinuxVM (
runCommand "${projectName}-image-${name}.img"
{
buildInputs = [ singularity e2fsprogs util-linux gawk ];
layerClosure = writeReferencesToFile layer;
layerClosure = writeClosure contents;
preVM = vmTools.createEmptyImage {
size = diskSize;
fullName = "${projectName}-run-disk";