OProfile 0.9.4.

svn path=/nixpkgs/trunk/; revision=12867

pkgs/development/tools/profiling/oprofile/default.nix

@@ -2,14 +2,19 @@
 , makeWrapper, gawk, which, gnugrep }:
 
 stdenv.mkDerivation rec {
-  name = "oprofile-0.9.3";
+  name = "oprofile-0.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/oprofile/${name}.tar.gz";
-    sha256 = "1jxj8h11rwaviy5dz2ra7q41qfgdl1psc4470327pk5bblbap1jg";
+    sha256 = "1pna65lpdxzbg4lcmpvayw1ibinbizrzwpdp0cq7vfinj0am456b";
   };
 
-  patches = [ ./opcontrol.patch ];
+  patchPhase = ''
+    sed -i "utils/opcontrol" \
+        -e "s|OPCONTROL=.*$|OPCONTROL=\"$out/bin/opcontrol\"|g ;
+            s|OPDIR=.*$|OPDIR=\"$out/bin\"|g ;
+            s|^PATH=.*$||g"
+  '';
 
   # FIXME: Add optional Qt support.
   buildInputs = [ binutils popt makeWrapper gawk which gnugrep ];
@@ -18,7 +23,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram "$out/bin/opcontrol"					\
-       --prefix PATH : "${gawk}/bin:${which}/bin:${gnugrep}/bin"
+       --prefix PATH : "$out/bin:${gawk}/bin:${which}/bin:${gnugrep}/bin"
   '';
 
   meta = {

pkgs/development/tools/profiling/oprofile/opcontrol.patch

@@ -1,16 +0,0 @@
---- oprofile-0.9.3/utils/opcontrol	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/utils/opcontrol	2008-06-04 23:05:20.000000000 +0200
-@@ -1647,12 +1647,10 @@ check_version()
- 
- # determine the location of opcontrol and related programs
- if test -z "$OPDIR"; then
--	BINDIR="/usr/bin"
--	OPCONTROL=`$BINDIR/which $0`
--	OPDIR=`$BINDIR/dirname $OPCONTROL`
-+	OPCONTROL=`which $0`
-+	OPDIR=`dirname $OPCONTROL`
- fi
- 
--PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
- 
- check_options_early $@