From 79f13f19f076df4b3f8e1d31b42449ee2c481353 Mon Sep 17 00:00:00 2001 From: Markus Mueller Date: Sun, 10 Sep 2017 09:31:11 +0000 Subject: [PATCH 1/2] oprofile: 1.1.0 -> 1.2.0 Fixes build with newer gcc versions. --- pkgs/development/tools/profiling/oprofile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 063b0375fc7d..4c2a7b241b7f 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -5,11 +5,11 @@ assert withGUI -> qt4 != null; stdenv.mkDerivation rec { - name = "oprofile-1.1.0"; + name = "oprofile-1.2.0"; src = fetchurl { url = "mirror://sourceforge/oprofile/${name}.tar.gz"; - sha256 = "0v1nn38h227bgxjwqf22rjp2iqgjm4ls3gckzifks0x6w5nrlxfg"; + sha256 = "0zd5ih6gmm1pkqavd9laa93iff7qv5jkbfjznhlyxl5p826gk5gb"; }; buildInputs = [ binutils zlib popt pkgconfig linuxHeaders libiberty_static ] From a26817b215b9df9e44f86282ed0b39005cd5603b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 10 Sep 2017 12:01:40 +0100 Subject: [PATCH 2/2] oprofile: fix hardcoded rm/cp paths --- pkgs/development/tools/profiling/oprofile/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 4c2a7b241b7f..ac87870eb590 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders +{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders, coreutils , libiberty_static, withGUI ? false , qt4 ? null}: # libX11 is needed because the Qt build stuff automatically adds `-lX11'. @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { 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 ] ++ stdenv.lib.optionals withGUI [ qt4 ];