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

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

Browse Source
This commit is contained in:
Timofei Kushnir 2015-10-12 15:02:01 +03:00
parent 6ea8f649e6
commit d7eb1dd8d0
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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