nvidia-docker: split out libnvidia-container into separate drv

5 files changed, 0 insertions, 265 deletions

diff --git a/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch b/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch
deleted file mode 100644
index d3f207de00b2..000000000000
--- a/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0070ada..802cef0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -202,7 +202,7 @@ $(BIN_NAME): $(BIN_OBJS)
- ##### Public rules #####
- 
- all: CPPFLAGS += -DNDEBUG
--all: shared static tools
-+all: shared tools
- 
- # Run with ASAN_OPTIONS="protect_shadow_gap=0" to avoid CUDA OOM errors
- debug: CFLAGS += -pedantic -fsanitize=undefined -fno-omit-frame-pointer -fno-common -fsanitize=address
-@@ -232,7 +232,6 @@ install: all
- 	# Install header files
- 	$(INSTALL) -m 644 $(LIB_INCS) $(DESTDIR)$(includedir)
- 	# Install library files
--	$(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir)
- 	$(INSTALL) -m 755 $(LIB_SHARED) $(DESTDIR)$(libdir)
- 	$(LN) -sf $(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SYMLINK)
- 	$(LDCONFIG) -n $(DESTDIR)$(libdir)
diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix
index 0df2efebd820..ac2b9db0c5cd 100644
--- a/pkgs/applications/virtualization/nvidia-docker/default.nix
+++ b/pkgs/applications/virtualization/nvidia-docker/default.nix
@@ -13,7 +13,6 @@
 }:
 
 with lib; let
-  libnvidia-container = callPackage ./libnvc.nix { };
   isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [
     {
       name = "runc";
@@ -74,7 +73,6 @@ stdenv.mkDerivation rec {
     cp nvidia-docker bin
     substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version}
 
-    cp ${libnvidia-container}/bin/nvidia-container-cli bin
     cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin
     cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin
   '';
@@ -83,9 +81,6 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{bin,etc}
     cp -r bin $out
 
-    wrapProgram $out/bin/nvidia-container-cli \
-      --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib
-
     # nvidia-container-runtime invokes docker-runc or runc if that isn't available on PATH
     wrapProgram $out/bin/nvidia-container-runtime --prefix PATH : ${isolatedContainerRuntimePath}
 
diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch
deleted file mode 100644
index d4638791a01c..000000000000
--- a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/src/ldcache.c b/src/ldcache.c
-index 38bab05..e1abc89 100644
---- a/src/ldcache.c
-+++ b/src/ldcache.c
-@@ -108,40 +108,27 @@ ldcache_close(struct ldcache *ctx)
- 
- int
- ldcache_resolve(struct ldcache *ctx, uint32_t arch, const char *root, const char * const libs[],
--    char *paths[], size_t size, ldcache_select_fn select, void *select_ctx)
-+    char *paths[], size_t size, const char* version)
- {
-         char path[PATH_MAX];
--        struct header_libc6 *h;
--        int override;
-+        char dir[PATH_MAX];
-+        char lib[PATH_MAX];
- 
--        h = (struct header_libc6 *)ctx->ptr;
-         memset(paths, 0, size * sizeof(*paths));
- 
--        for (uint32_t i = 0; i < h->nlibs; ++i) {
--                int32_t flags = h->libs[i].flags;
--                char *key = (char *)ctx->ptr + h->libs[i].key;
--                char *value = (char *)ctx->ptr + h->libs[i].value;
--
--                if (!(flags & LD_ELF) || (flags & LD_ARCH_MASK) != arch)
-+        for (size_t j = 0; j < size; ++j) {
-+                snprintf(dir, 100, "/run/opengl-driver%s/lib",
-+                    arch == LD_I386_LIB32 ? "-32" : "");
-+                if (!strncmp(libs[j], "libvdpau_nvidia.so", 100))
-+                  strcat(dir, "/vdpau");
-+                snprintf(lib, 100, "%s/%s.%s", dir, libs[j], version);
-+                if (path_resolve_full(ctx->err, path, "/", lib) < 0)
-+                        return (-1);
-+                if (!file_exists(ctx->err, path))
-                         continue;
--
--                for (size_t j = 0; j < size; ++j) {
--                        if (!str_has_prefix(key, libs[j]))
--                                continue;
--                        if (path_resolve(ctx->err, path, root, value) < 0)
--                                return (-1);
--                        if (paths[j] != NULL && str_equal(paths[j], path))
--                                continue;
--                        if ((override = select(ctx->err, select_ctx, root, paths[j], path)) < 0)
--                                return (-1);
--                        if (override) {
--                                free(paths[j]);
--                                paths[j] = xstrdup(ctx->err, path);
--                                if (paths[j] == NULL)
--                                        return (-1);
--                        }
--                        break;
--                }
-+                paths[j] = xstrdup(ctx->err, path);
-+                if (paths[j] == NULL)
-+                        return (-1);
-         }
-         return (0);
- }
-diff --git a/src/ldcache.h b/src/ldcache.h
-index 33d78dd..2b087db 100644
---- a/src/ldcache.h
-+++ b/src/ldcache.h
-@@ -50,6 +50,6 @@ void ldcache_init(struct ldcache *, struct error *, const char *);
- int  ldcache_open(struct ldcache *);
- int  ldcache_close(struct ldcache *);
- int  ldcache_resolve(struct ldcache *, uint32_t, const char *, const char * const [],
--    char *[], size_t, ldcache_select_fn, void *);
-+    char *[], size_t, const char*);
- 
- #endif /* HEADER_LDCACHE_H */
-diff --git a/src/nvc_info.c b/src/nvc_info.c
-index 30e3cfd..6d12a50 100644
---- a/src/nvc_info.c
-+++ b/src/nvc_info.c
-@@ -167,15 +167,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char *
-         if (path_resolve_full(err, path, root, ldcache) < 0)
-                 return (-1);
-         ldcache_init(&ld, err, path);
--        if (ldcache_open(&ld) < 0)
--                return (-1);
- 
-         info->nlibs = size;
-         info->libs = array_new(err, size);
-         if (info->libs == NULL)
-                 goto fail;
-         if (ldcache_resolve(&ld, LIB_ARCH, root, libs,
--            info->libs, info->nlibs, select_libraries_fn, info) < 0)
-+            info->libs, info->nlibs, info->nvrm_version) < 0)
-                 goto fail;
- 
-         info->nlibs32 = size;
-@@ -183,13 +181,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char *
-         if (info->libs32 == NULL)
-                 goto fail;
-         if (ldcache_resolve(&ld, LIB32_ARCH, root, libs,
--            info->libs32, info->nlibs32, select_libraries_fn, info) < 0)
-+            info->libs32, info->nlibs32, info->nvrm_version) < 0)
-                 goto fail;
-         rv = 0;
- 
-  fail:
--        if (ldcache_close(&ld) < 0)
--                return (-1);
-         return (rv);
- }
- 
-@@ -203,7 +199,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r
-         char path[PATH_MAX];
-         int rv = -1;
- 
--        if ((env = secure_getenv("PATH")) == NULL) {
-+        if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin") == NULL) {
-                 error_setx(err, "environment variable PATH not found");
-                 return (-1);
-         }
-diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c
-index 6ff380f..cbe6a69 100644
---- a/src/nvc_ldcache.c
-+++ b/src/nvc_ldcache.c
-@@ -340,7 +340,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt)
-         if (validate_args(ctx, cnt != NULL) < 0)
-                 return (-1);
- 
--        argv = (char * []){cnt->cfg.ldconfig, cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
-+        argv = (char * []){cnt->cfg.ldconfig, "-f", "/tmp/ld.so.conf.nvidia-host", "-C", "/tmp/ld.so.cache.nvidia-host", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
-         if (*argv[0] == '@') {
-                 /*
-                  * We treat this path specially to be relative to the host filesystem.
diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
deleted file mode 100644
index 95d66582618e..000000000000
--- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, pkgconfig
-, libelf
-, libcap
-, libseccomp
-, rpcsvc-proto
-, libtirpc
-}:
-let
-  modp-ver = "450.57";
-  nvidia-modprobe = fetchFromGitHub {
-    owner = "NVIDIA";
-    repo = "nvidia-modprobe";
-    rev = modp-ver;
-    sha256 = "0r4f6lpbbqqs9932xd2mr7bxn6a3xdalcwq332fc1amrrkgzfyv7";
-  };
-in
-stdenv.mkDerivation rec {
-  pname = "libnvidia-container";
-  version = "1.3.1";
-
-  src = fetchFromGitHub {
-    owner = "NVIDIA";
-    repo = "libnvidia-container";
-    rev = "v${version}";
-    sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq";
-  };
-
-  patches = [
-    # locations of nvidia-driver libraries are not resolved via ldconfig which
-    # doesn't get used on NixOS. Additional support binaries like nvidia-smi
-    # are not resolved via the environment PATH but via the derivation output
-    # path.
-    ./libnvc-ldconfig-and-path-fixes.patch
-
-    # the libnvidia-container Makefile wants to build and install static
-    # libtirpc libraries; this patch prevents that from happening
-    ./avoid-static-libtirpc-build.patch
-  ];
-
-  makeFlags = [
-    "WITH_LIBELF=yes"
-    "prefix=$(out)"
-    # we can't use the WITH_TIRPC=yes flag that exists in the Makefile for the
-    # same reason we patch out the static library use of libtirpc so we set the
-    # define in CFLAGS
-    "CFLAGS=-DWITH_TIRPC"
-  ];
-
-  postPatch = ''
-    sed -i \
-      -e 's/^REVISION :=.*/REVISION = ${src.rev}/' \
-      -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
-      mk/common.mk
-
-    mkdir -p deps/src/nvidia-modprobe-${modp-ver}
-    cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver}
-    chmod -R u+w deps/src
-    pushd deps/src
-    patch -p0 < ${./modprobe.patch}
-    touch nvidia-modprobe-${modp-ver}/.download_stamp
-    popd
-  '';
-
-  NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
-  NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ];
-
-  nativeBuildInputs = [ pkgconfig rpcsvc-proto ];
-
-  buildInputs = [ libelf libcap libseccomp libtirpc ];
-
-  meta = with lib; {
-    homepage = "https://github.com/NVIDIA/libnvidia-container";
-    description = "NVIDIA container runtime library";
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/virtualization/nvidia-docker/modprobe.patch b/pkgs/applications/virtualization/nvidia-docker/modprobe.patch
deleted file mode 100644
index 8e7b0a723ec0..000000000000
--- a/pkgs/applications/virtualization/nvidia-docker/modprobe.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c
---- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c	2020-07-09 17:06:05.000000000 +0000
-+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c	2020-08-18 12:43:03.223871514 +0000
-@@ -840,10 +840,10 @@
-     return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH);
- }
-
--static int nvidia_cap_get_device_file_attrs(const char* cap_file_path,
--                                            int *major,
--                                            int *minor,
--                                            char *name)
-+int nvidia_cap_get_device_file_attrs(const char* cap_file_path,
-+                                     int *major,
-+                                     int *minor,
-+                                     char *name)
- {
-     char field[32];
-     FILE *fp;
-diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h
---- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h	2020-07-09 17:06:05.000000000 +0000
-+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h	2020-08-18 12:43:44.227745050 +0000
-@@ -81,6 +81,7 @@
- int nvidia_nvswitch_get_file_state(int minor);
- int nvidia_cap_mknod(const char* cap_file_path, int *minor);
- int nvidia_cap_get_file_state(const char* cap_file_path);
-+int nvidia_cap_get_device_file_attrs(const char* cap_file_path, int *major, int *minor, char *name);
- int nvidia_get_chardev_major(const char *name);
-
- #endif /* NV_LINUX */