mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 04:02:10 +00:00
Merge pull request #10346 from tk-ecotelecom/develop
oprofile: depend on kernel headers to correctly compile 'operf' util.
This commit is contained in:
commit
35059e73ff
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue