cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #144080 from trofi/fix-mtr-for-ncurses-6.3

Browse source 
mtr: fix build against upcoming ncurses-6.3
This commit is contained in:
Michael Raskin 2021-11-01 09:16:04 +00:00 committed by GitHub
commit ab7c6b8b62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/networking/mtr/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config { stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config
, libcap, ncurses , libcap, ncurses
, withGtk ? false, gtk3 }: , withGtk ? false, gtk3 }:
@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6"; sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6";
}; };
patches = [
# pull patch to fix build failure against ncurses-6.3:
# https://github.com/traviscross/mtr/pull/411
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/traviscross/mtr/commit/aeb493e08eabcb4e6178bda0bb84e9cd01c9f213.patch";
sha256 = "1qk8lf4sha18g36mr84vbdvll2s8khgbzyyq0as3ifx44lv0qlf2";
})
];
# we need this before autoreconfHook does its thing # we need this before autoreconfHook does its thing
postPatch = '' postPatch = ''
echo ${version} > .tarball-version echo ${version} > .tarball-version