diff options
author | Yueh-Shun Li <shamrocklee@posteo.net> | 2024-03-15 08:33:22 +0800 |
---|---|---|
committer | Yueh-Shun Li <shamrocklee@posteo.net> | 2024-03-19 05:30:54 +0800 |
commit | 5c1a3b619db5a664977f60cddd3280355d3888a5 (patch) | |
tree | 47584a106843d43fde46dda0e1c813f90e568901 /pkgs | |
parent | e28ad1a0a31395783c5f813f52346b7405ae5d87 (diff) | |
download | nixlib-5c1a3b619db5a664977f60cddd3280355d3888a5.tar nixlib-5c1a3b619db5a664977f60cddd3280355d3888a5.tar.gz nixlib-5c1a3b619db5a664977f60cddd3280355d3888a5.tar.bz2 nixlib-5c1a3b619db5a664977f60cddd3280355d3888a5.tar.lz nixlib-5c1a3b619db5a664977f60cddd3280355d3888a5.tar.xz nixlib-5c1a3b619db5a664977f60cddd3280355d3888a5.tar.zst nixlib-5c1a3b619db5a664977f60cddd3280355d3888a5.zip |
singularity-tools.buildImages: use writeClosure
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/singularity-tools/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 8d7ad9e742a1..c9e53a4cb706 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -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"; |