diff options
| author | WilliButz <WilliButz@users.noreply.github.com> | 2020-09-21 13:36:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-21 13:36:52 +0200 |
| commit | 087fe53de8a674de390b18ddb933ad95fcc7053b (patch) | |
| tree | c6366094c2c9f903207ec182b428028ee043d290 | |
| parent | 7df88097141eb78448830c6730a16e3e0a6e5c64 (diff) | |
| parent | 0996ac6b0ea3fb8530cfe59c24a1af4baeb553b4 (diff) | |
Merge pull request #98374 from knedlsepp/fix-nvtop
nvtop: Make independent of Nvidia driver version
| -rw-r--r-- | pkgs/tools/system/nvtop/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index cd9ec7c7082d2..59636fb5dc809 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }: +{ stdenv, fetchFromGitHub, cmake, cudatoolkit, ncurses, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "nvtop"; @@ -6,22 +6,26 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Syllo"; - repo = "nvtop"; + repo = "nvtop"; rev = version; sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4"; }; 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fe1e4cd52538..025fbab5a67ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |