diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2023-09-12 12:16:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-12 12:16:47 +0000 |
| commit | 49f1b36299f24a9c61e74a885dceb48bef06f539 (patch) | |
| tree | cd99ae93962caa2ec7eb1657d195ff4dfaa5b9b9 | |
| parent | bf39054f8666a98196671269351e42db7e0db6bc (diff) | |
| parent | e70ead8965be7d28cc851cf8775d4029b44ff827 (diff) | |
Merge pull request #254713 from wahjava/fix-mtr
mtr: import a patch from upstream to fix segfault
| -rw-r--r-- | pkgs/tools/networking/mtr/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index bf324c57d497a..c586d6a75ef1d 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , libcap @@ -21,6 +22,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-f5bL3IdXibIc1xXCuZHwcEV5vhypRE2mLsS3A8HW2QM="; }; + patches = [ (fetchpatch { # https://github.com/traviscross/mtr/pull/468 + url = "https://github.com/traviscross/mtr/commit/5908af4c19188cb17b62f23368b6ef462831a0cb.patch"; + hash = "sha256-rTydtU8+Wc4nGEKh1GOkhcpgME4hwsACy82gKPaIe64="; + }) ]; + # we need this before autoreconfHook does its thing postPatch = '' echo ${version} > .tarball-version |