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

libnvidia-container: 1.0.0 -> 1.0.6

Browse Source
This commit is contained in:
Michael Lingelbach 2020-04-26 19:18:00 -07:00 committed by Jon
parent 1a70e4ffa6
commit 4a704c653b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch
View File

@ -71,10 +71,10 @@ index 33d78dd..2b087db 100644
#endif /* HEADER_LDCACHE_H */ #endif /* HEADER_LDCACHE_H */
diff --git a/src/nvc_info.c b/src/nvc_info.c 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 --- a/src/nvc_info.c
+++ b/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) if (path_resolve_full(err, path, root, ldcache) < 0)
return (-1); return (-1);
ldcache_init(&ld, err, path); ldcache_init(&ld, err, path);
@ -91,7 +91,7 @@ index cc96542..3fe7612 100644
goto fail; goto fail;
info->nlibs32 = size; 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) if (info->libs32 == NULL)
goto fail; goto fail;
if (ldcache_resolve(&ld, LIB32_ARCH, root, libs, if (ldcache_resolve(&ld, LIB32_ARCH, root, libs,
@ -106,7 +106,7 @@ index cc96542..3fe7612 100644
return (rv); 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]; char path[PATH_MAX];
int rv = -1; int rv = -1;
@ -116,10 +116,10 @@ index cc96542..3fe7612 100644
return (-1); return (-1);
} }
diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c 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 --- a/src/nvc_ldcache.c
+++ b/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) if (validate_args(ctx, cnt != NULL) < 0)
return (-1); return (-1);

8
pkgs/applications/virtualization/nvidia-docker/libnvc.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, libelf, libcap, libseccomp }: { stdenv, lib, fetchFromGitHub, pkgconfig, libelf, libcap, libseccomp }:
with lib; let with lib; let
@ -13,13 +13,13 @@ with lib; let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "libnvidia-container"; pname = "libnvidia-container";
version = "1.0.0"; version = "1.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NVIDIA"; owner = "NVIDIA";
repo = "libnvidia-container"; repo = "libnvidia-container";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ws6mfsbgxhzlb5w1r8qqg2arvxkr21n59i4cqsyz3h5jsqsflbw"; sha256 = "1pnpc9knwh8d1zqb28zc3spkjc00w0z10vd3jna8ksvpl35jl7w3";
}; };
# locations of nvidia-driver libraries are not resolved via ldconfig which # 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 touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp
''; '';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libelf libcap libseccomp ]; buildInputs = [ libelf libcap libseccomp ];
meta = { meta = {