summary refs log tree commit diff
path: root/pkgs/os-specific/linux/radeontop
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2016-07-04 22:31:40 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2016-07-05 09:29:42 +0200
commitcb86518fd390f2c13bf36aa8f5c6256df7dd7f6b (patch)
tree411b96725eadb66f0357910a11f43092005fdbb6 /pkgs/os-specific/linux/radeontop
parent65364cc83c7ccc0b1e1572208b6d511184b355c0 (diff)
downloadnixpkgs-cb86518fd390f2c13bf36aa8f5c6256df7dd7f6b.tar
nixpkgs-cb86518fd390f2c13bf36aa8f5c6256df7dd7f6b.tar.gz
nixpkgs-cb86518fd390f2c13bf36aa8f5c6256df7dd7f6b.tar.bz2
nixpkgs-cb86518fd390f2c13bf36aa8f5c6256df7dd7f6b.tar.lz
nixpkgs-cb86518fd390f2c13bf36aa8f5c6256df7dd7f6b.tar.xz
nixpkgs-cb86518fd390f2c13bf36aa8f5c6256df7dd7f6b.tar.zst
nixpkgs-cb86518fd390f2c13bf36aa8f5c6256df7dd7f6b.zip
radeontop: 2016-07-03 -> 2016-07-04
Add support for unprivileged use on both the Linux console and X.
Diffstat (limited to 'pkgs/os-specific/linux/radeontop')
-rw-r--r--pkgs/os-specific/linux/radeontop/default.nix18
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index 0c4c702a95c..adf02dfa9d7 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gettext, ncurses, libdrm, libpciaccess }:
+{ stdenv, fetchFromGitHub, pkgconfig, gettext, makeWrapper
+, ncurses, libdrm, libpciaccess, libxcb }:
 
 stdenv.mkDerivation rec {
   name = "radeontop-${version}";
-  version = "2016-07-03";
+  version = "2016-07-04";
 
   src = fetchFromGitHub {
-    sha256 = "0achjjhq1fnka8fvn78jbd7zjnra2wcalvr7k4lj3c28x15k1iv8";
-    rev = "761ffe28696cdadc96c8cf302b58c9ef71a2eae1";
+    sha256 = "07pj5c3shnxljwq0hkksw7qnp8kb3n5ngihdmi4fqbmyz8in2vm5";
+    rev = "bb3ed18aa8877f2816348ca9f016bb61d67e636f";
     repo = "radeontop";
     owner = "clbr";
   };
 
-  buildInputs = [ ncurses libdrm libpciaccess ];
-  nativeBuildInputs = [ pkgconfig gettext ];
+  buildInputs = [ ncurses libdrm libpciaccess libxcb ];
+  nativeBuildInputs = [ pkgconfig gettext makeWrapper ];
 
   enableParallelBuilding = true;
 
@@ -22,6 +23,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
+  postInstall = ''
+    wrapProgram $out/sbin/radeontop \
+      --prefix LD_LIBRARY_PATH : $out/lib
+  '';
+
   meta = with stdenv.lib; {
     description = "Top-like tool for viewing AMD Radeon GPU utilization";
     longDescription = ''