diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-12 18:01:30 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-12 18:01:30 +0000 |
commit | 564dc31f47ac641bdd42f3d0998fc411c05d56fa (patch) | |
tree | 5a0c7067ae569ccb16976732066a5f632f22c3b8 /pkgs/tools/networking/mtr/default.nix | |
parent | 757197a9dfbe52b16b116b39ada02d4e4098b4af (diff) | |
parent | 41b9c0a6d9467cece015ffc7016b9e7e73542157 (diff) | |
download | nixpkgs-564dc31f47ac641bdd42f3d0998fc411c05d56fa.tar nixpkgs-564dc31f47ac641bdd42f3d0998fc411c05d56fa.tar.gz nixpkgs-564dc31f47ac641bdd42f3d0998fc411c05d56fa.tar.bz2 nixpkgs-564dc31f47ac641bdd42f3d0998fc411c05d56fa.tar.lz nixpkgs-564dc31f47ac641bdd42f3d0998fc411c05d56fa.tar.xz nixpkgs-564dc31f47ac641bdd42f3d0998fc411c05d56fa.tar.zst nixpkgs-564dc31f47ac641bdd42f3d0998fc411c05d56fa.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/networking/mtr/default.nix')
-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 bf324c57d49..c586d6a75ef 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 |