diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-09 08:42:04 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-09 08:42:04 +0100 |
commit | 6bea415b5e3f4ab70afcea4c646ad76d9c073c89 (patch) | |
tree | 8f5e976cd8aecc6029b4019e16f0177e0a66a093 /pkgs/development/tools/profiling | |
parent | b846a53d2a3cba3002a4d6fb064f579677eac52c (diff) | |
parent | 4bf9f8afc39e9d0c0629635652804b81fe3e3332 (diff) | |
download | nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.gz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.bz2 nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.lz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.xz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.zst nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/tools/profiling')
-rw-r--r-- | pkgs/development/tools/profiling/systemtap/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index b78727802454..a16bdbc539a9 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,11 +1,11 @@ { fetchgit, pkgconfig, gettext, runCommand, makeWrapper -, elfutils, kernel, gnumake }: +, elfutils, kernel, gnumake, python2, pythonPackages, binutils }: let ## fetchgit info url = git://sourceware.org/git/systemtap.git; - rev = "a10bdceb7c9a7dc52c759288dd2e555afcc5184a"; - sha256 = "1kllzfnh4ksis0673rma5psglahl6rvy0xs5v05qkqn6kl7irmg1"; - version = "2016-09-16"; + rev = "276ed27a3cc64531542ab73bb36bb04784e79bbc"; + sha256 = "11967dx3cjs96v3ncfljw0h7blsgg9wm8g9z2270q9a90988g2c2"; + version = "2017-02-04"; inherit (kernel) stdenv; inherit (stdenv) lib; @@ -14,7 +14,13 @@ let stapBuild = stdenv.mkDerivation { name = "systemtap-${version}"; 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; }; @@ -48,5 +54,5 @@ in runCommand "systemtap-${kernel.version}-${version}" { rm $out/bin/stap makeWrapper $stapBuild/bin/stap $out/bin/stap \ --add-flags "-r $kernelBuildDir" \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc elfutils gnumake ]} + --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc binutils elfutils gnumake ]} '' |