Merge pull request #281143 from ethorsoe/trace-cmd-path
trace-cmd: search path properly when running commands
This commit is contained in:
commit
8c6fb2212d
1 changed files with 9 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchzip, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }:
|
||||
{ lib, stdenv, fetchpatch, fetchzip, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trace-cmd";
|
||||
version = "3.2";
|
||||
|
@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-rTcaaEQ3Y4cneNnZSGiMZNp+Z7dyAa3oNTNMAEXr28g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream patches to be released in the next version
|
||||
(fetchpatch {
|
||||
sha256 = "sha256-eGuHODm29M7rbGYsyXUPoNe1xsIG3eJYhwXQDakRJHA=";
|
||||
url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/patch/?id=6b07a7df871342068604b204711ab741d421d051";
|
||||
})
|
||||
];
|
||||
|
||||
# Don't build and install html documentation
|
||||
postPatch = ''
|
||||
sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' \
|
||||
|
|
Loading…
Reference in a new issue