diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2023-11-23 01:37:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-23 01:37:54 +0100 |
| commit | bf01ec00a0b196c84f84f153da2d14effa0867a7 (patch) | |
| tree | a89b73e2b3e19e20aa375eca6df6a0b2695a77ad /pkgs/applications/virtualization | |
| parent | c10d7026fbae24c51e87586c6b6e4c46c0365007 (diff) | |
| parent | ac776695313a2da0ee99ba328da474f606a7a9d9 (diff) | |
| download | nixlib-bf01ec00a0b196c84f84f153da2d14effa0867a7.tar nixlib-bf01ec00a0b196c84f84f153da2d14effa0867a7.tar.gz nixlib-bf01ec00a0b196c84f84f153da2d14effa0867a7.tar.bz2 nixlib-bf01ec00a0b196c84f84f153da2d14effa0867a7.tar.lz nixlib-bf01ec00a0b196c84f84f153da2d14effa0867a7.tar.xz nixlib-bf01ec00a0b196c84f84f153da2d14effa0867a7.tar.zst nixlib-bf01ec00a0b196c84f84f153da2d14effa0867a7.zip | |
Merge pull request #250949 from ShamrockLee/apptainer-localstatedir
apptainer, singularity: use self-contained LOCALSTATEDIR by default
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/singularity/generic.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 3b110d9bc991..9f17dc8eb03d 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -71,6 +71,8 @@ in , newuidmapPath ? null # Path to SUID-ed newgidmap executable , newgidmapPath ? null + # External LOCALSTATEDIR +, externalLocalStateDir ? null # Remove the symlinks to `singularity*` when projectName != "singularity" , removeCompat ? false # Workaround #86349 @@ -106,6 +108,7 @@ in inherit enableSeccomp enableSuid + externalLocalStateDir projectName removeCompat starterSuidPath @@ -141,7 +144,7 @@ in configureScript = "./mconfig"; configureFlags = [ - "--localstatedir=/var/lib" + "--localstatedir=${if externalLocalStateDir != null then externalLocalStateDir else "${placeholder "out"}/var/lib"}" "--runstatedir=/var/run" ] ++ lib.optional (!enableSeccomp) "--without-seccomp" |