public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix oprofile.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32402
This commit is contained in:
Eelco Dolstra 2012-02-19 17:03:38 +00:00
parent 5baef98dd9
commit a50d32e4db
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/profiling/oprofile/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep, zlib { 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'. # 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)); && (libpng != null));
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "oprofile-0.9.6"; name = "oprofile-0.9.7";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/oprofile/${name}.tar.gz"; url = "mirror://sourceforge/oprofile/${name}.tar.gz";
sha256 = "103q0w4wr5lnhg1yfdhc67dvdwzqpzml57fp4l6nbz29fw5d839z"; sha256 = "09ymfgcvp6372xnxdbq664ba8f4nzz4cxlya7wi8s1gabmym0nyb";
}; };
patchPhase = '' patchPhase = ''
@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ binutils zlib popt makeWrapper gawk which gnugrep ] 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 = configureFlags =
[ "--with-kernel-support" [ "--with-kernel-support"
"--disable-shared" # needed because only the static libbfd is available "--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 = '' postInstall = ''
wrapProgram "$out/bin/opcontrol" \ wrapProgram "$out/bin/opcontrol" \

11
pkgs/top-level/all-packages.nix
View File

@ -3079,15 +3079,8 @@ let
openocd = callPackage ../development/tools/misc/openocd { }; openocd = callPackage ../development/tools/misc/openocd { };
oprofile = import ../development/tools/profiling/oprofile { oprofile = callPackage ../development/tools/profiling/oprofile {
inherit fetchurl stdenv binutils popt makeWrapper gawk which gnugrep zlib; qt3 = null;
# Optional build inputs for the (useless) GUI.
/*
qt = qt3;
inherit (xlibs) libX11 libXext;
inherit libpng;
*/
}; };
patchelf = callPackage ../development/tools/misc/patchelf { }; patchelf = callPackage ../development/tools/misc/patchelf { };