cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

libnvidia-container: depend on elfutils instead of unmaintained libelf

Browse source 
Also, make the entries in `pkgs/top-level/all-packages.nix` more regular.
This commit is contained in:
Philip Taron 2023-12-01 14:52:21 -08:00
parent 80e5019b1d
commit 251e2ecf86
No known key found for this signature in database
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/virtualization/libnvidia-container/default.nix
View file

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

5
pkgs/top-level/all-packages.nix
View file

@ -5907,6 +5907,8 @@ with pkgs;
libnvme = callPackage ../os-specific/linux/libnvme { }; libnvme = callPackage ../os-specific/linux/libnvme { };
libnvidia-container = callPackage ../applications/virtualization/libnvidia-container { };
librenms = callPackage ../servers/monitoring/librenms { }; librenms = callPackage ../servers/monitoring/librenms { };
libxnd = callPackage ../development/libraries/libxnd { }; libxnd = callPackage ../development/libraries/libxnd { };
@ -24227,9 +24229,8 @@ with pkgs;
mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }:
let let
nvidia-container-toolkit = callPackage ../applications/virtualization/nvidia-container-toolkit { 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 { in symlinkJoin {
inherit name; inherit name;
paths = [ paths = [