pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #230992 from ShamrockLee/singularity-nvidia

apptainer, singularity: fix wrapper PATH prefix

authored by

Justin Bedő and committed by
GitHub 430b94c3 88202839

+5 -1
unified split
+5 -1
pkgs/applications/virtualization/singularity/generic.nix
··· 207 substituteInPlace "$out/bin/run-singularity" \ 208 --replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}" 209 wrapProgram "$out/bin/${projectName}" \ 210 - --prefix PATH : "''${defaultPathInputs// /\/bin:}" 211 # Make changes in the config file 212 ${lib.optionalString enableNvidiaContainerCli '' 213 substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ 214 --replace "use nvidia-container-cli = no" "use nvidia-container-cli = yes" 215 ''} 216 ${lib.optionalString (removeCompat && (projectName != "singularity")) '' 217 unlink "$out/bin/singularity"
··· 207 substituteInPlace "$out/bin/run-singularity" \ 208 --replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}" 209 wrapProgram "$out/bin/${projectName}" \ 210 + --prefix PATH : "''${defaultPathInputs// /\/bin:}''${defaultPathInputs:+/bin:}" 211 # Make changes in the config file 212 ${lib.optionalString enableNvidiaContainerCli '' 213 substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ 214 --replace "use nvidia-container-cli = no" "use nvidia-container-cli = yes" 215 + ''} 216 + ${lib.optionalString (enableNvidiaContainerCli && projectName == "singularity") '' 217 + substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ 218 + --replace "# nvidia-container-cli path =" "nvidia-container-cli path = ${nvidia-docker}/bin/nvidia-container-cli" 219 ''} 220 ${lib.optionalString (removeCompat && (projectName != "singularity")) '' 221 unlink "$out/bin/singularity"