diff options
| author | Michael Lingelbach <m.j.lbach@gmail.com> | 2020-04-26 19:18:00 -0700 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-04-30 13:53:47 -0700 |
| commit | 4a704c653b06b423b771f92af4f5c069df7dd682 (patch) | |
| tree | 5c942a9d9ad51cd93809a6eb65c18a75444d142c /pkgs/applications/virtualization/nvidia-docker | |
| parent | 1a70e4ffa642cc7558d862428cfafc4068e3bc98 (diff) | |
libnvidia-container: 1.0.0 -> 1.0.6
Diffstat (limited to 'pkgs/applications/virtualization/nvidia-docker')
| -rw-r--r-- | pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch | 12 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/nvidia-docker/libnvc.nix | 8 |
2 files changed, 11 insertions, 9 deletions
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 index 043c1efade8a..9ae8d6b5e756 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch @@ -71,10 +71,10 @@ index 33d78dd..2b087db 100644 #endif /* HEADER_LDCACHE_H */ diff --git a/src/nvc_info.c b/src/nvc_info.c -index cc96542..3fe7612 100644 +index 30e3cfd..6d12a50 100644 --- a/src/nvc_info.c +++ b/src/nvc_info.c -@@ -163,15 +163,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * +@@ -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); @@ -91,7 +91,7 @@ index cc96542..3fe7612 100644 goto fail; info->nlibs32 = size; -@@ -179,13 +177,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * +@@ -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, @@ -106,7 +106,7 @@ index cc96542..3fe7612 100644 return (rv); } -@@ -199,7 +195,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r +@@ -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; @@ -116,10 +116,10 @@ index cc96542..3fe7612 100644 return (-1); } diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c -index d41a24d..65b7878 100644 +index 6ff380f..cbe6a69 100644 --- a/src/nvc_ldcache.c +++ b/src/nvc_ldcache.c -@@ -331,7 +331,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) +@@ -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); diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix index f2c9eda75fc5..5b97d7fffa29 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libelf, libcap, libseccomp }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, libelf, libcap, libseccomp }: with lib; let @@ -13,13 +13,13 @@ with lib; let in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.0.0"; + version = "1.0.6"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libnvidia-container"; rev = "v${version}"; - sha256 = "1ws6mfsbgxhzlb5w1r8qqg2arvxkr21n59i4cqsyz3h5jsqsflbw"; + sha256 = "1pnpc9knwh8d1zqb28zc3spkjc00w0z10vd3jna8ksvpl35jl7w3"; }; # locations of nvidia-driver libraries are not resolved via ldconfig which @@ -42,6 +42,8 @@ in stdenv.mkDerivation rec { touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp ''; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libelf libcap libseccomp ]; meta = { |