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

Merge pull request #98374 from knedlsepp/fix-nvtop

Browse Source 
nvtop: Make independent of Nvidia driver version
This commit is contained in:
WilliButz 2020-09-21 13:36:52 +02:00 committed by GitHub
commit 087fe53de8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/tools/system/nvtop/default.nix
View File

@ -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";
@ -6,22 +6,26 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Syllo"; owner = "Syllo";
repo = "nvtop"; repo = "nvtop";
rev = version; rev = version;
sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4"; sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4";
}; };
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;

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };