mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
Merge pull request #190755 from matthiasbeyer/update-multitail
multitail: 6.5.0 -> 6.5.2
This commit is contained in:
commit
d9c6fad2d0
@ -1,35 +1,27 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkg-config }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.5.0";
|
||||
version = "7.0.0";
|
||||
pname = "multitail";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.vanheusden.com/multitail/${pname}-${version}.tgz";
|
||||
sha256 = "1vd9vdxyxsccl64ilx542ya5vlw2bpg6gnkq1x8cfqy6vxvmx7dj";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folkertvanheusden";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-AMW55Bmwn0BsD36qGXI5WmEfydrMBob8NRY3Tyq92vA=";
|
||||
};
|
||||
|
||||
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 cmake ];
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
makeFlags = lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp multitail $out/bin
|
||||
cp bin/multitail $out/bin
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/halturin/multitail";
|
||||
description = "tail on Steroids";
|
||||
|
Loading…
Reference in New Issue
Block a user