From a50d32e4db6c6c9c2fe9c4cd9863a4ba213fd264 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Feb 2012 17:03:38 +0000
Subject: [PATCH] * Fix oprofile.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32402
---
.../development/tools/profiling/oprofile/default.nix | 12 ++++++------
pkgs/top-level/all-packages.nix | 11 ++---------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix
index 143704126f44..56d72294177e 100644
--- a/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/pkgs/development/tools/profiling/oprofile/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep, zlib
-, qt ? null, libX11 ? null, libXext ? null, libpng ? null }:
+, qt3 ? null, libX11 ? null, libXext ? null, libpng ? null }:
# libX11 is needed because the Qt build stuff automatically adds `-lX11'.
-assert (qt != null) -> ((libX11 != null) && (libXext != null)
+assert (qt3 != null) -> ((libX11 != null) && (libXext != null)
&& (libpng != null));
stdenv.mkDerivation rec {
- name = "oprofile-0.9.6";
+ name = "oprofile-0.9.7";
src = fetchurl {
url = "mirror://sourceforge/oprofile/${name}.tar.gz";
- sha256 = "103q0w4wr5lnhg1yfdhc67dvdwzqpzml57fp4l6nbz29fw5d839z";
+ sha256 = "09ymfgcvp6372xnxdbq664ba8f4nzz4cxlya7wi8s1gabmym0nyb";
};
patchPhase = ''
@@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ binutils zlib popt makeWrapper gawk which gnugrep ]
- ++ stdenv.lib.optionals (qt != null) [ qt libX11 libXext libpng ];
+ ++ stdenv.lib.optionals (qt3 != null) [ qt3 libX11 libXext libpng ];
configureFlags =
[ "--with-kernel-support"
"--disable-shared" # needed because only the static libbfd is available
]
- ++ stdenv.lib.optional (qt != null) "--with-qt-dir=${qt}";
+ ++ stdenv.lib.optional (qt3 != null) "--with-qt-dir=${qt3}";
postInstall = ''
wrapProgram "$out/bin/opcontrol" \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d405b01bcc3a..1478dccdbd55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3079,15 +3079,8 @@ let
openocd = callPackage ../development/tools/misc/openocd { };
- oprofile = import ../development/tools/profiling/oprofile {
- inherit fetchurl stdenv binutils popt makeWrapper gawk which gnugrep zlib;
-
- # Optional build inputs for the (useless) GUI.
- /*
- qt = qt3;
- inherit (xlibs) libX11 libXext;
- inherit libpng;
- */
+ oprofile = callPackage ../development/tools/profiling/oprofile {
+ qt3 = null;
};
patchelf = callPackage ../development/tools/misc/patchelf { };