diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-27 12:24:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-27 12:24:05 +0000 |
commit | 2137c13b409525616ce92598e3440c088096044a (patch) | |
tree | 530aaab70d1dc1687518cadfb8e91b8e611fc776 /pkgs/development/tools | |
parent | 6d452e839b7012170dc80900987436eac69f7394 (diff) | |
parent | 693c7cd0f7e6ce6ff7c6210ac1857712dac4cad5 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/profiling/systemtap/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index c978d8bd96a7..c5d65a8239ea 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, pkg-config, gettext, runCommand, makeWrapper +{ lib, fetchgit, pkg-config, gettext, runCommand, makeWrapper , elfutils, kernel, gnumake, python2, python2Packages }: @@ -10,7 +10,6 @@ let version = "4.1"; inherit (kernel) stdenv; - inherit (stdenv) lib; ## stap binaries stapBuild = stdenv.mkDerivation { |