diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2018-10-11 08:20:08 +0200 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2018-10-12 12:20:35 +0200 |
| commit | ee561d9f57d28d15925ae3407c6ae82065369bfe (patch) | |
| tree | a46c53a9ff2da93fa7e8f6e95f30d54a3e1e6d24 /pkgs/development/tools/profiling | |
| parent | ce6db5e36e1d01576d042b219b5208508696dab3 (diff) | |
| download | nixlib-ee561d9f57d28d15925ae3407c6ae82065369bfe.tar nixlib-ee561d9f57d28d15925ae3407c6ae82065369bfe.tar.gz nixlib-ee561d9f57d28d15925ae3407c6ae82065369bfe.tar.bz2 nixlib-ee561d9f57d28d15925ae3407c6ae82065369bfe.tar.lz nixlib-ee561d9f57d28d15925ae3407c6ae82065369bfe.tar.xz nixlib-ee561d9f57d28d15925ae3407c6ae82065369bfe.tar.zst nixlib-ee561d9f57d28d15925ae3407c6ae82065369bfe.zip | |
linuxPackages.systemtap: 3.2 (2017.10.18) -> 3.3
removed quoting workaround. should be fixed as of https://sourceware.org/PR22462
Diffstat (limited to 'pkgs/development/tools/profiling')
| -rw-r--r-- | pkgs/development/tools/profiling/systemtap/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 55902f48bb73..ecc86d51a06e 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -5,9 +5,9 @@ let ## fetchgit info url = git://sourceware.org/git/systemtap.git; - rev = "4051c70c9318c837981384cbb23f3e9eb1bd0892"; - sha256 = "0sd8n3j3rishks3gyqj2jyqhps7hmlfjyz8i0w8v98cczhhh04rq"; - version = "2017.10.18"; + rev = "release-${version}"; + sha256 = "0hckbmrlcz5nj438409fmdjjaaqzf68r2242v10lkssw5daia1gj"; + version = "3.3"; inherit (kernel) stdenv; inherit (stdenv) lib; @@ -18,12 +18,6 @@ let src = fetchgit { inherit url rev sha256; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ elfutils gettext python2 python2Packages.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; }; @@ -53,7 +47,7 @@ in runCommand "systemtap-${kernel.version}-${version}" { }; } '' mkdir -p $out/bin - for bin in $stapBuild/bin/*; do # hello emacs */ + for bin in $stapBuild/bin/*; do ln -s $bin $out/bin done rm $out/bin/stap $out/bin/dtrace |