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

Merge pull request #146354 from trofi/fix-multitail-for-ncurses-6.3

Browse source
This commit is contained in:
Sandro 2021-11-22 15:16:50 +01:00 committed by GitHub
commit 39088d783c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/tools/misc/multitail/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, ncurses, pkg-config }: { lib, stdenv, fetchurl, fetchpatch, ncurses, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "6.5.0"; version = "6.5.0";
@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
sha256 = "1vd9vdxyxsccl64ilx542ya5vlw2bpg6gnkq1x8cfqy6vxvmx7dj"; sha256 = "1vd9vdxyxsccl64ilx542ya5vlw2bpg6gnkq1x8cfqy6vxvmx7dj";
}; };
patches = [
# Fix pending upstream inclusion for ncurses-6.3:
# https://github.com/halturin/multitail/pull/4
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/halturin/multitail/commit/d7d10f3bce261074c116eba9f924b61f43777662.patch";
sha256 = "0kyp9l6v92mz6d3h34j11gs5kh3sf2nv76mygqfxb800vd8r0cgg";
})
];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
@ -21,7 +31,7 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
homepage = "http://www.vanheusden.com/multitail/"; homepage = "https://github.com/halturin/multitail";
description = "tail on Steroids"; description = "tail on Steroids";
maintainers = with lib.maintainers; [ matthiasbeyer ]; maintainers = with lib.maintainers; [ matthiasbeyer ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;