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

Merge pull request #10346 from tk-ecotelecom/develop

Browse Source 
oprofile: depend on kernel headers to correctly compile 'operf' util.
This commit is contained in:
Peter Simons 2015-10-13 11:12:55 +02:00
commit 35059e73ff
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig
{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders
, withGUI ? false , qt4 ? null}:
# libX11 is needed because the Qt build stuff automatically adds `-lX11'.
@ -12,10 +12,11 @@ stdenv.mkDerivation rec {
sha256 = "0nn4wfvwy4nii25y6lwlrnzx9ah4nz0r93yk7hswiy6wxjs10wc4";
};
buildInputs = [ binutils zlib popt pkgconfig ]
buildInputs = [ binutils zlib popt pkgconfig linuxHeaders ]
++ stdenv.lib.optionals withGUI [ qt4 ];
configureFlags = [
"--with-kernel=${linuxHeaders}"
"--disable-shared" # needed because only the static libbfd is available
]
++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4";