mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-11-05 17:56:46 +01:00
Merge pull request #144080 from trofi/fix-mtr-for-ncurses-6.3
mtr: fix build against upcoming ncurses-6.3
This commit is contained in:
commit
ab7c6b8b62
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue