From ad41a600e58a24abf6721d81e9630d4ce3ebd153 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 9 Jul 2015 13:18:21 +0200 Subject: [PATCH] oprofile: update from 0.9.9 to 1.0.0 (ZHF) fixes the build with recent versions of binutils --- .../tools/profiling/oprofile/default.nix | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 6c7b2a4d9ae1..561fea6ef7b0 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,26 +1,18 @@ -{ stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep, zlib -, pkgconfig +{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig , withGUI ? false , qt4 ? null}: # libX11 is needed because the Qt build stuff automatically adds `-lX11'. assert withGUI -> qt4 != null; stdenv.mkDerivation rec { - name = "oprofile-0.9.9"; + name = "oprofile-1.0.0"; src = fetchurl { url = "mirror://sourceforge/oprofile/${name}.tar.gz"; - sha256 = "15vm24jhw4xfd55pfw1rlpzfsh4bl1vyjsajs78bi9xbv8038lhy"; + sha256 = "0nn4wfvwy4nii25y6lwlrnzx9ah4nz0r93yk7hswiy6wxjs10wc4"; }; - patchPhase = '' - sed -i "utils/opcontrol" \ - -e "s|OPCONTROL=.*$|OPCONTROL=\"$out/bin/opcontrol\"|g ; - s|OPDIR=.*$|OPDIR=\"$out/bin\"|g ; - s|^PATH=.*$||g" - ''; - - buildInputs = [ binutils zlib popt makeWrapper gawk which gnugrep pkgconfig ] + buildInputs = [ binutils zlib popt pkgconfig ] ++ stdenv.lib.optionals withGUI [ qt4 ]; configureFlags = [ @@ -28,11 +20,6 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4"; - postInstall = '' - wrapProgram "$out/bin/opcontrol" \ - --prefix PATH : "$out/bin:${gawk}/bin:${which}/bin:${gnugrep}/bin" - ''; - meta = { description = "System-wide profiler for Linux"; longDescription = ''