diff options
| author | Yueh-Shun Li <44064051+ShamrockLee@users.noreply.github.com> | 2023-04-06 12:37:08 +0800 |
|---|---|---|
| committer | Yueh-Shun Li <44064051+ShamrockLee@users.noreply.github.com> | 2023-04-06 12:40:09 +0800 |
| commit | f6e7fccfa6b22fb8928fd1c3cf8401f7fef17e11 (patch) | |
| tree | b838c32dc292809cb92c7fe1bcc1693a9acacd65 /pkgs/applications/virtualization/singularity | |
| parent | 1f32cee4d41d5602efa74600a6d1146887494bd7 (diff) | |
| download | nixpkgs-f6e7fccfa6b22fb8928fd1c3cf8401f7fef17e11.tar nixpkgs-f6e7fccfa6b22fb8928fd1c3cf8401f7fef17e11.tar.gz nixpkgs-f6e7fccfa6b22fb8928fd1c3cf8401f7fef17e11.tar.bz2 nixpkgs-f6e7fccfa6b22fb8928fd1c3cf8401f7fef17e11.tar.lz nixpkgs-f6e7fccfa6b22fb8928fd1c3cf8401f7fef17e11.tar.xz nixpkgs-f6e7fccfa6b22fb8928fd1c3cf8401f7fef17e11.tar.zst nixpkgs-f6e7fccfa6b22fb8928fd1c3cf8401f7fef17e11.zip | |
apptainer, singularity: unify the PATH prefix to defaultPath and wrapProgram
Use defaultPathInputs to control both path prefixes, reducing the number of input lists to maintain.
Diffstat (limited to 'pkgs/applications/virtualization/singularity')
| -rw-r--r-- | pkgs/applications/virtualization/singularity/generic.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 3ef3d2bbf9b..f35a7ddd692 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -148,6 +148,7 @@ in bash coreutils cryptsetup # cryptsetup + fakeroot go privileged-un-utils squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image @@ -195,10 +196,7 @@ in substituteInPlace "$out/bin/run-singularity" \ --replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}" wrapProgram "$out/bin/${projectName}" \ - --prefix PATH : "${lib.makeBinPath [ - fakeroot - squashfsTools # Singularity (but not Apptainer) expects unsquashfs from the host PATH - ]}" + --prefix PATH : "''${defaultPathInputs// /\/bin:}" # Make changes in the config file ${lib.optionalString enableNvidiaContainerCli '' substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ |