gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libnvidia-container: include binaries from driver package (#372320)

Browse Source
This commit is contained in:
Connor Baker
2025-01-14 08:58:21 -08:00
committed by GitHub
parent f0a8311232 6e4ca5ceaa
commit 2f6a15c5a3
2 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/li/libnvidia-container/0002-nvc-nvidia-docker-compatible-binary-lookups.patch
+8 -24
View File
@@ -3,42 +3,26 @@ From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Fri, 20 Dec 2024 16:37:07 +0100
Subject: [PATCH] nvc: nvidia-docker-compatible binary lookups
This patch maintains compatibility with NixOS' `virtualisation.docker.enableNvidia` option (which is to be removed soon), while also enabling supplying a custom PATH, to work with the modern CDI-based approach.
This patch maintains compatibility with NixOS' `virtualisation.docker.enableNvidia` option (which is to be removed soon), while also including the driver package's path, to work with the modern CDI-based approach.
---
src/nvc_info.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
src/nvc_info.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/nvc_info.c b/src/nvc_info.c
index cf4b1905fd2127c28ee16649501be122d3be5261..2ab552860ef98879b76398a6f9be95f07b2c8a4a 100644
index cf4b1905fd2127c28ee16649501be122d3be5261..cdfa19721bc913d8e2adb96d106cd65ee6111623 100644
--- a/src/nvc_info.c
+++ b/src/nvc_info.c
@@ -243,16 +243,28 @@ static int
find_binary_paths(struct error *err, struct dxcore_context* dxcore, struct nvc_driver_info* info,
const char *root, const char * const bins[], size_t size)
{
- char *env, *ptr;
+ char *env, *ptr, *os_path;
const char *dir;
char tmp[PATH_MAX];
@@ -249,10 +249,13 @@ find_binary_paths(struct error *err, struct dxcore_context* dxcore, struct nvc_d
char path[PATH_MAX];
int rv = -1;
- if ((env = secure_getenv("PATH")) == NULL) {
+ if ((os_path = secure_getenv("PATH")) == NULL) {
+ // TODO: Remove this patch once `virtualisation.docker.enableNvidia` is removed from NixOS.
+ // It only exists to maintain compatibility with the old nvidia-docker package.
+ if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin:@driverLink@/bin") == NULL) {
error_setx(err, "environment variable PATH not found");
return (-1);
}
+
+ // TODO: Remove this patch once `virtualisation.docker.enableNvidia` is removed from NixOS.
+ // It only exists to maintain compatibility with the old nvidia-docker package.
+ int p_rv = snprintf(env, PATH_MAX, "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin:%s", os_path);
+ if (p_rv >= PATH_MAX) {
+ error_setx(err, "PATH environment variable too long");
+ return (-1);
+ } else if (p_rv < 0) {
+ error_setx(err, "error setting PATH environment variable");
+ return (-1);
+ }
+
if ((env = ptr = xstrdup(err, env)) == NULL)
return (-1);
pkgs/by-name/li/libnvidia-container/package.nix
+3 -1
View File
@@ -52,7 +52,9 @@ stdenv.mkDerivation rec {
# for binary lookups.
# TODO: Remove the legacy compatibility once nvidia-docker is removed
# from NixOS.
./0002-nvc-nvidia-docker-compatible-binary-lookups.patch
(replaceVars ./0002-nvc-nvidia-docker-compatible-binary-lookups.patch {
inherit (addDriverRunpath) driverLink;
})
# fix bogus struct declaration
./0003-nvc-fix-struct-declaration.patch