alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

oprofile: depend on kernel headers to correctly compile 'operf' util.

Browse source
This commit is contained in:
Timofei Kushnir 2015-10-12 17:50:13 +03:00
parent d7eb1dd8d0
commit aefa4a181f
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/tools/profiling/oprofile/default.nix
View file

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

4
pkgs/top-level/all-packages.nix
View file

@ -5656,9 +5656,7 @@ let
openocd = callPackage ../development/tools/misc/openocd { };
oprofile = callPackage ../development/tools/profiling/oprofile {
kernelHeaders = linuxHeaders;
};
oprofile = callPackage ../development/tools/profiling/oprofile { };
patchelf = callPackage ../development/tools/misc/patchelf { };