diff options
author | Justin Bedo <cu@cua0.org> | 2017-11-07 14:47:20 +1100 |
---|---|---|
committer | Justin Bedo <cu@cua0.org> | 2017-12-21 10:50:06 +1100 |
commit | db927ea35b655129a0a6590d60ba8c53730c22c7 (patch) | |
tree | 97a81e765a45c0d01612f8111e3dba368a54e774 /pkgs/build-support/singularity-tools/default.nix | |
parent | 02d361cea9d20fe4746092a9ced207b1d0dcd9e9 (diff) | |
download | nixpkgs-db927ea35b655129a0a6590d60ba8c53730c22c7.tar nixpkgs-db927ea35b655129a0a6590d60ba8c53730c22c7.tar.gz nixpkgs-db927ea35b655129a0a6590d60ba8c53730c22c7.tar.bz2 nixpkgs-db927ea35b655129a0a6590d60ba8c53730c22c7.tar.lz nixpkgs-db927ea35b655129a0a6590d60ba8c53730c22c7.tar.xz nixpkgs-db927ea35b655129a0a6590d60ba8c53730c22c7.tar.zst nixpkgs-db927ea35b655129a0a6590d60ba8c53730c22c7.zip |
singularity: 2.2 -> 2.4
Diffstat (limited to 'pkgs/build-support/singularity-tools/default.nix')
-rw-r--r-- | pkgs/build-support/singularity-tools/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 3c27b9fc1ad..62cf13e5202 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -61,6 +61,7 @@ rec { mkfs -t ext3 -b 4096 /dev/${vmTools.hd} mount /dev/${vmTools.hd} disk cd disk + mkdir proc sys dev # Run root script ${stdenv.lib.optionalString (runAsRoot != null) '' @@ -92,8 +93,10 @@ rec { cd disk export PATH=$PATH:${e2fsprogs}/bin/ - singularity create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out - tar -c . | singularity import $out + echo creating + singularity image.create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out + echo importing + tar -c . | singularity image.import $out ''); in result; |