diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-03 11:30:44 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-03 11:30:44 +0000 |
| commit | 5a568ee185e43738e102c4a28f965787e7744866 (patch) | |
| tree | aedd742ce09b1b9733766e305606120b7e532207 /pkgs/development | |
| parent | 53e80e5316148573a329674073bfb60592f5a00c (diff) | |
| download | nixpkgs-5a568ee185e43738e102c4a28f965787e7744866.tar nixpkgs-5a568ee185e43738e102c4a28f965787e7744866.tar.gz nixpkgs-5a568ee185e43738e102c4a28f965787e7744866.tar.bz2 nixpkgs-5a568ee185e43738e102c4a28f965787e7744866.tar.lz nixpkgs-5a568ee185e43738e102c4a28f965787e7744866.tar.xz nixpkgs-5a568ee185e43738e102c4a28f965787e7744866.tar.zst nixpkgs-5a568ee185e43738e102c4a28f965787e7744866.zip | |
Updating oprofile
svn path=/nixpkgs/trunk/; revision=32751
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/profiling/oprofile/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 143704126f4..fdd4ad6f027 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 }: +, 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 @@ stdenv.mkDerivation rec { 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" \ |