ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

systemtap: 2016-09-16 -> 2017-02-04

Browse Source
This commit is contained in:
Volth 2017-02-05 05:43:35 +00:00 committed by Franz Pletz
parent 9beeee2717
commit c771d499f9
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/tools/profiling/systemtap/default.nix
View File

@ -1,11 +1,11 @@
{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper { fetchgit, pkgconfig, gettext, runCommand, makeWrapper
, elfutils, kernel, gnumake }: , elfutils, kernel, gnumake, python2, pythonPackages, binutils }:
let let
## fetchgit info ## fetchgit info
url = git://sourceware.org/git/systemtap.git; url = git://sourceware.org/git/systemtap.git;
rev = "a10bdceb7c9a7dc52c759288dd2e555afcc5184a"; rev = "276ed27a3cc64531542ab73bb36bb04784e79bbc";
sha256 = "1kllzfnh4ksis0673rma5psglahl6rvy0xs5v05qkqn6kl7irmg1"; sha256 = "11967dx3cjs96v3ncfljw0h7blsgg9wm8g9z2270q9a90988g2c2";
version = "2016-09-16"; version = "2017-02-04";
inherit (kernel) stdenv; inherit (kernel) stdenv;
inherit (stdenv) lib; inherit (stdenv) lib;
@ -14,7 +14,13 @@ let
stapBuild = stdenv.mkDerivation { stapBuild = stdenv.mkDerivation {
name = "systemtap-${version}"; name = "systemtap-${version}";
src = fetchgit { inherit url rev sha256; }; src = fetchgit { inherit url rev sha256; };
buildInputs = [ elfutils pkgconfig gettext ]; buildInputs = [ elfutils pkgconfig gettext python2 pythonPackages.setuptools ];
# FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs
postPatch = ''
substituteInPlace buildrun.cxx --replace \
'o << "EXTRA_CFLAGS += -I\"" << s.runtime_path << "\"" << endl;' \
'o << "EXTRA_CFLAGS += -I" << s.runtime_path << endl;'
'';
enableParallelBuilding = true; enableParallelBuilding = true;
}; };
@ -48,5 +54,5 @@ in runCommand "systemtap-${kernel.version}-${version}" {
rm $out/bin/stap rm $out/bin/stap
makeWrapper $stapBuild/bin/stap $out/bin/stap \ makeWrapper $stapBuild/bin/stap $out/bin/stap \
--add-flags "-r $kernelBuildDir" \ --add-flags "-r $kernelBuildDir" \
--prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc elfutils gnumake ]} --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc binutils elfutils gnumake ]}
'' ''