Merge pull request #98374 from knedlsepp/fix-nvtop
nvtop: Make independent of Nvidia driver version
This commit is contained in:
commit
087fe53de8
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }:
|
{ stdenv, fetchFromGitHub, cmake, cudatoolkit, ncurses, addOpenGLRunpath }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nvtop";
|
pname = "nvtop";
|
||||||
|
@ -13,15 +13,19 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DNVML_INCLUDE_DIRS=${cudatoolkit}/include"
|
"-DNVML_INCLUDE_DIRS=${cudatoolkit}/include"
|
||||||
"-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so"
|
"-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so"
|
||||||
"-DCMAKE_BUILD_TYPE=Release"
|
"-DCMAKE_BUILD_TYPE=Release"
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake addOpenGLRunpath ];
|
||||||
buildInputs = [ ncurses nvidia_x11 cudatoolkit ];
|
buildInputs = [ ncurses cudatoolkit ];
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
addOpenGLRunpath $out/bin/nvtop
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "A (h)top like like task monitor for NVIDIA GPUs";
|
description = "A (h)top like task monitor for NVIDIA GPUs";
|
||||||
homepage = "https://github.com/Syllo/nvtop";
|
homepage = "https://github.com/Syllo/nvtop";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
|
|
@ -14607,9 +14607,7 @@ in
|
||||||
|
|
||||||
nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { };
|
nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { };
|
||||||
|
|
||||||
nvtop = callPackage ../tools/system/nvtop {
|
nvtop = callPackage ../tools/system/nvtop { };
|
||||||
nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
|
|
||||||
};
|
|
||||||
|
|
||||||
ocl-icd = callPackage ../development/libraries/ocl-icd { };
|
ocl-icd = callPackage ../development/libraries/ocl-icd { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue