mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 21:33:03 +03:00
oprofile: update from 0.9.9 to 1.0.0 (ZHF)
fixes the build with recent versions of binutils
This commit is contained in:
parent
6d32ae415a
commit
ad41a600e5
@ -1,26 +1,18 @@
|
|||||||
{ stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep, zlib
|
{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig
|
||||||
, pkgconfig
|
|
||||||
, withGUI ? false , qt4 ? null}:
|
, withGUI ? false , qt4 ? null}:
|
||||||
|
|
||||||
# libX11 is needed because the Qt build stuff automatically adds `-lX11'.
|
# libX11 is needed because the Qt build stuff automatically adds `-lX11'.
|
||||||
assert withGUI -> qt4 != null;
|
assert withGUI -> qt4 != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "oprofile-0.9.9";
|
name = "oprofile-1.0.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/oprofile/${name}.tar.gz";
|
url = "mirror://sourceforge/oprofile/${name}.tar.gz";
|
||||||
sha256 = "15vm24jhw4xfd55pfw1rlpzfsh4bl1vyjsajs78bi9xbv8038lhy";
|
sha256 = "0nn4wfvwy4nii25y6lwlrnzx9ah4nz0r93yk7hswiy6wxjs10wc4";
|
||||||
};
|
};
|
||||||
|
|
||||||
patchPhase = ''
|
buildInputs = [ binutils zlib popt pkgconfig ]
|
||||||
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 ]
|
|
||||||
++ stdenv.lib.optionals withGUI [ qt4 ];
|
++ stdenv.lib.optionals withGUI [ qt4 ];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
@ -28,11 +20,6 @@ stdenv.mkDerivation rec {
|
|||||||
]
|
]
|
||||||
++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4";
|
++ 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 = {
|
meta = {
|
||||||
description = "System-wide profiler for Linux";
|
description = "System-wide profiler for Linux";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user