Author: viric
Date: Sat Mar 3 11:30:44 2012
New Revision: 32751
URL: https://nixos.org/websvn/nix/?rev=32751&sc=1
Log:
Updating oprofile
Modified:
nixpkgs/trunk/pkgs/development/tools/profiling/oprofile/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/tools/profiling/oprofile/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/profiling/oprofile/default.nix Sat Mar
3 09:55:08 2012 (r32750)
+++ nixpkgs/trunk/pkgs/development/tools/profiling/oprofile/default.nix Sat Mar
3 11:30:44 2012 (r32751)
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep, zlib
-, qt ? null, libX11 ? null, libXext ? null, libpng ? null }:
+, pkgconfig
+, withGUI ? false , qt4 ? null}:
# libX11 is needed because the Qt build stuff automatically adds `-lX11'.
-assert (qt != null) -> ((libX11 != null) && (libXext != null)
- && (libpng != null));
+assert withGui -> qt4 != 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 = ''
@@ -20,14 +20,14 @@
s|^PATH=.*$||g"
'';
- buildInputs = [ binutils zlib popt makeWrapper gawk which gnugrep ]
- ++ stdenv.lib.optionals (qt != null) [ qt libX11 libXext libpng ];
+ buildInputs = [ binutils zlib popt makeWrapper gawk which gnugrep pkgconfig ]
+ ++ stdenv.lib.optionals withGui [ qt4 ];
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 withGui "--with-qt-dir=${qt4} --enable-gui=qt4";
postInstall = ''
wrapProgram "$out/bin/opcontrol" \
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Mar 3 09:55:08
2012 (r32750)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Mar 3 11:30:44
2012 (r32751)
@@ -3120,16 +3120,7 @@
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 { };
patchelf = callPackage ../development/tools/misc/patchelf { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
