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

numatop: 2.1 -> 2.2, fix build errors from format strings

Browse source 
Also grab CK's PR for other string operation fixups.
This commit is contained in:
Will Dietz 2022-01-31 12:53:54 -06:00
parent bea399e226
commit 8673391cb7
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/os-specific/linux/numatop/default.nix
View file

@ -1,17 +1,32 @@
{ lib, stdenv, fetchurl, pkg-config, numactl, ncurses, check }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, numactl, ncurses, check }:
stdenv.mkDerivation rec {
pname = "numatop";
version = "2.1";
src = fetchurl {
url = "https://github.com/intel/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz";
sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76";
version = "2.2";
src = fetchFromGitHub {
owner = "intel";
repo = "numatop";
rev = "v${version}";
sha256 = "sha256-GJvTwqgx34ZW10eIJj/xiKe3ZkAfs7GlJImz8jrnjfI=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ numactl ncurses ];
checkInputs = [ check ];
patches = [
(fetchpatch {
url = "https://github.com/intel/numatop/pull/54.patch";
sha256 = "sha256-TbMLv7TT9T8wE4uJ1a/AroyPPwrwL0eX5IBLsh9GTTM=";
name = "fix-string-operations.patch";
})
(fetchpatch {
url = "https://github.com/intel/numatop/pull/64.patch";
sha256 = "sha256-IevbSFJRTS5iQ5apHOVXzF67f3LJaW6j7DySFmVuyiM=";
name = "fix-format-strings-mvwprintw.patch";
})
];
doCheck = true;
meta = with lib; {