Unverified Commit 087fe53d authored by WilliButz's avatar WilliButz Committed by GitHub
Browse files

Merge pull request #98374 from knedlsepp/fix-nvtop 

nvtop: Make independent of Nvidia driver version
parents 7df88097 0996ac6b

pkgs/tools/system/nvtop/default.nix

+10 −6
Original line number Diff line number Diff line 
{ stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }:

{ stdenv, fetchFromGitHub, cmake, cudatoolkit, ncurses, addOpenGLRunpath }:



stdenv.mkDerivation rec {

  pname = "nvtop";
@@ -13,15 +13,19 @@ stdenv.mkDerivation rec { 


  cmakeFlags = [

    "-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"

  ];



  nativeBuildInputs = [ cmake ];

  buildInputs = [ ncurses nvidia_x11 cudatoolkit ];

  nativeBuildInputs = [ cmake addOpenGLRunpath ];

  buildInputs = [ ncurses cudatoolkit ];



  postFixup = ''

    addOpenGLRunpath $out/bin/nvtop

  '';



  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";

    license = licenses.gpl3;

    platforms = platforms.linux;

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -14607,9 +14607,7 @@ in 














  nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { };



























  nvtop = callPackage ../tools/system/nvtop {













    nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };













  };













  nvtop = callPackage ../tools/system/nvtop { };





























  ocl-icd = callPackage ../development/libraries/ocl-icd { };