1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix
index 38de21872b9f..3864ad945835 100644
--- a/pkgs/development/tools/misc/pahole/default.nix
+++ b/pkgs/development/tools/misc/pahole/default.nix
@@ -1,20 +1,19 @@
 { stdenv, fetchgit, cmake, elfutils, zlib }:
 
-stdenv.mkDerivation {
-  name = "pahole-head";
+stdenv.mkDerivation rec {
+  name = "pahole-${version}";
+  version = "1.12";
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git;
-    sha256 = "05f8a14ea6c200c20e9c6738593b38e4ced73a9cef86499ccd7af910eb9b74b3";
-    rev = "1decb1bc4a412a0902b7b25190d755a875022d03";
+    sha256 = "1a8xfwqdc2j3ydh9bk2pkvsaf3lrkbxj66vj991c7knc31ix8kpw";
+    rev = "v${version}";
   };
-  buildInputs = [ cmake elfutils zlib ];
 
-  postInstall = ''
-    for p in $out/bin/*; do
-      rpath=`patchelf --print-rpath $p || true`:$out
-      patchelf --set-rpath "$rpath" $p || true
-    done
-  '';
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ elfutils zlib ];
+
+  # Put libraries in "lib" subdirectory, not top level of $out
+  cmakeFlags = [ "-D__LIB=lib" ];
 
   meta = with stdenv.lib; {
     homepage = https://git.kernel.org/cgit/devel/pahole/pahole.git/;