diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2008-09-15 15:26:01 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2008-09-15 15:26:01 +0000 |
| commit | 88f0359c5c957d80849eba8b9fd930d0515185bc (patch) | |
| tree | 62a5ae9b95105c4643eb4671235dca5c478deac5 /pkgs/development/tools/profiling | |
| parent | 8261a3b1b06eb76b8fa82e84981fde5eb919956c (diff) | |
| download | nixlib-88f0359c5c957d80849eba8b9fd930d0515185bc.tar nixlib-88f0359c5c957d80849eba8b9fd930d0515185bc.tar.gz nixlib-88f0359c5c957d80849eba8b9fd930d0515185bc.tar.bz2 nixlib-88f0359c5c957d80849eba8b9fd930d0515185bc.tar.lz nixlib-88f0359c5c957d80849eba8b9fd930d0515185bc.tar.xz nixlib-88f0359c5c957d80849eba8b9fd930d0515185bc.tar.zst nixlib-88f0359c5c957d80849eba8b9fd930d0515185bc.zip | |
OProfile 0.9.4.
svn path=/nixpkgs/trunk/; revision=12867
Diffstat (limited to 'pkgs/development/tools/profiling')
| -rw-r--r-- | pkgs/development/tools/profiling/oprofile/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/tools/profiling/oprofile/opcontrol.patch | 16 |
2 files changed, 9 insertions, 20 deletions
diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index ca44470598ff..fd6dc825d1eb 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/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 = { diff --git a/pkgs/development/tools/profiling/oprofile/opcontrol.patch b/pkgs/development/tools/profiling/oprofile/opcontrol.patch deleted file mode 100644 index fa072c738ffe..000000000000 --- a/pkgs/development/tools/profiling/oprofile/opcontrol.patch +++ /dev/null @@ -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 $@ |