Merge pull request #276351 from philiptaron/libnvidia-container

libnvidia-container: depend on elfutils instead of unmaintained libelf
This commit is contained in:
Maciej Krüger 2023-12-23 21:18:23 +01:00 committed by GitHub
commit 9b5ade95b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View File

@ -3,7 +3,7 @@
, addOpenGLRunpath
, fetchFromGitHub
, pkg-config
, libelf
, elfutils
, libcap
, libseccomp
, rpcsvc-proto
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper removeReferencesTo ];
buildInputs = [ libelf libcap libseccomp libtirpc ];
buildInputs = [ elfutils libcap libseccomp libtirpc ];
makeFlags = [
"WITH_LIBELF=yes"

View File

@ -5909,6 +5909,8 @@ with pkgs;
libnvme = callPackage ../os-specific/linux/libnvme { };
libnvidia-container = callPackage ../applications/virtualization/libnvidia-container { };
librenms = callPackage ../servers/monitoring/librenms { };
libxnd = callPackage ../development/libraries/libxnd { };
@ -24231,9 +24233,8 @@ with pkgs;
mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }:
let
nvidia-container-toolkit = callPackage ../applications/virtualization/nvidia-container-toolkit {
inherit containerRuntimePath configTemplate libnvidia-container;
inherit containerRuntimePath configTemplate;
};
libnvidia-container =(callPackage ../applications/virtualization/libnvidia-container { });
in symlinkJoin {
inherit name;
paths = [