Merge pull request #29185 from markus2342/update-oprofile
oprofile: 1.1.0 -> 1.2.0
This commit is contained in:
commit
ad4f798c0b
@ -1,17 +1,23 @@
|
|||||||
{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders
|
{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders, coreutils
|
||||||
, libiberty_static, withGUI ? false , qt4 ? null}:
|
, libiberty_static, 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-1.1.0";
|
name = "oprofile-1.2.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/oprofile/${name}.tar.gz";
|
url = "mirror://sourceforge/oprofile/${name}.tar.gz";
|
||||||
sha256 = "0v1nn38h227bgxjwqf22rjp2iqgjm4ls3gckzifks0x6w5nrlxfg";
|
sha256 = "0zd5ih6gmm1pkqavd9laa93iff7qv5jkbfjznhlyxl5p826gk5gb";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace opjitconv/opjitconv.c \
|
||||||
|
--replace "/bin/rm" "${coreutils}/bin/rm" \
|
||||||
|
--replace "/bin/cp" "${coreutils}/bin/cp"
|
||||||
|
'';
|
||||||
|
|
||||||
buildInputs = [ binutils zlib popt pkgconfig linuxHeaders libiberty_static ]
|
buildInputs = [ binutils zlib popt pkgconfig linuxHeaders libiberty_static ]
|
||||||
++ stdenv.lib.optionals withGUI [ qt4 ];
|
++ stdenv.lib.optionals withGUI [ qt4 ];
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user