diff options
| author | Peter Simons <simons@cryp.to> | 2015-10-13 11:12:55 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-10-13 11:12:55 +0200 |
| commit | 35059e73ff85afd58ab1134781a95f53bdc597b9 (patch) | |
| tree | 4928358fafb8a772d99ba6545425dc6da4d4fb0c /pkgs/development/tools | |
| parent | 4760b6ea6dafa9c1dba26a8aabc59960713eef2e (diff) | |
| parent | aefa4a181fbb391e7c237f711bc88f949dc75156 (diff) | |
| download | nixlib-35059e73ff85afd58ab1134781a95f53bdc597b9.tar nixlib-35059e73ff85afd58ab1134781a95f53bdc597b9.tar.gz nixlib-35059e73ff85afd58ab1134781a95f53bdc597b9.tar.bz2 nixlib-35059e73ff85afd58ab1134781a95f53bdc597b9.tar.lz nixlib-35059e73ff85afd58ab1134781a95f53bdc597b9.tar.xz nixlib-35059e73ff85afd58ab1134781a95f53bdc597b9.tar.zst nixlib-35059e73ff85afd58ab1134781a95f53bdc597b9.zip | |
Merge pull request #10346 from tk-ecotelecom/develop
oprofile: depend on kernel headers to correctly compile 'operf' util.
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/profiling/oprofile/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 561fea6ef7b0..542ff000423a 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -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"; |