summary refs log tree commit diff
diff options
context:
space:
mode:
authorgbtb <goodbetterthebeast3@gmail.com>2022-06-14 00:25:17 +1000
committergbtb <goodbetterthebeast3@gmail.com>2022-06-14 00:25:17 +1000
commit857208f207e4d6636b3163a74a6afb001b8c5937 (patch)
tree12e9fed79dbe383647e7f0956c7ef2846e9ccab7
parent02cd48717d5249876b181cf9555a48041dd33ae7 (diff)
downloadnixpkgs-857208f207e4d6636b3163a74a6afb001b8c5937.tar
nixpkgs-857208f207e4d6636b3163a74a6afb001b8c5937.tar.gz
nixpkgs-857208f207e4d6636b3163a74a6afb001b8c5937.tar.bz2
nixpkgs-857208f207e4d6636b3163a74a6afb001b8c5937.tar.lz
nixpkgs-857208f207e4d6636b3163a74a6afb001b8c5937.tar.xz
nixpkgs-857208f207e4d6636b3163a74a6afb001b8c5937.tar.zst
nixpkgs-857208f207e4d6636b3163a74a6afb001b8c5937.zip
nvtop: 2.0.1 -> 2.0.2
-rw-r--r--pkgs/tools/system/nvtop/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix
index b25897b6926..9b3ac780099 100644
--- a/pkgs/tools/system/nvtop/default.nix
+++ b/pkgs/tools/system/nvtop/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , cmake
+, gtest
 , cudatoolkit
 , libdrm
 , ncurses
@@ -23,24 +24,25 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nvtop" + pname-suffix;
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "Syllo";
     repo = "nvtop";
     rev = version;
-    sha256 = "sha256-4Alc5pBXb38PUhTRhdKZMiW+P3daDB0q3jiVL8qqEe4=";
+    sha256 = "sha256-TlhCU7PydzHG/YMlk922mxEJ3CZw40784U0w1YawI3I=";
   };
 
   cmakeFlags = with lib; [
     "-DCMAKE_BUILD_TYPE=Release"
+    "-DBUILD_TESTING=ON"
   ] ++ optional nvidia "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include"
   ++ optional nvidia "-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so"
   ++ optional (!amd) "-DAMDGPU_SUPPORT=OFF"
   ++ optional (!nvidia) "-DNVIDIA_SUPPORT=OFF"
   ++ optional amd "-DLibdrm_INCLUDE_DIRS=${libdrm}/lib/stubs/libdrm.so.2"
   ;
-  nativeBuildInputs = [ cmake] ++ lib.optional nvidia addOpenGLRunpath;
+  nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addOpenGLRunpath;
   buildInputs = with lib; [ ncurses ]
     ++ optional nvidia cudatoolkit
     ++ optional amd libdrm
@@ -49,11 +51,13 @@ stdenv.mkDerivation rec {
   # ordering of fixups is important
   postFixup = (lib.optionalString amd amd-postFixup) + (lib.optionalString nvidia nvidia-postFixup);
 
+  doCheck = true;
+
   meta = with lib; {
     description = "A (h)top like task monitor for AMD and NVIDIA GPUs";
     longDescription = ''
       Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way.
-  '';
+    '';
     homepage = "https://github.com/Syllo/nvtop";
     license = licenses.gpl3;
     platforms = platforms.linux;