numatop: 2.1 -> 2.2, fix build errors from format strings
Also grab CK's PR for other string operation fixups.
This commit is contained in:
parent
bea399e226
commit
8673391cb7
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "numatop";
|
pname = "numatop";
|
||||||
version = "2.1";
|
version = "2.2";
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://github.com/intel/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz";
|
owner = "intel";
|
||||||
sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76";
|
repo = "numatop";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-GJvTwqgx34ZW10eIJj/xiKe3ZkAfs7GlJImz8jrnjfI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||||
buildInputs = [ numactl ncurses ];
|
buildInputs = [ numactl ncurses ];
|
||||||
checkInputs = [ check ];
|
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;
|
doCheck = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Reference in a new issue