JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #145881 from trofi/fix-hirst-for-ncurses-6.3

Browse Source 
host: pull pending upstream inclusion fix for ncurses-6.3
This commit is contained in:
Jörg Thalheim 2021-11-14 11:48:01 +00:00 committed by GitHub
commit e4c43ce8d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/networking/horst/default.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }:
{lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, ncurses, libnl }:
stdenv.mkDerivation rec {
pname = "horst";
@ -11,6 +11,22 @@ stdenv.mkDerivation rec {
sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a";
};
patches = [
# Fix pending upstream inclusion for ncurses-6.3:
# https://github.com/br101/horst/pull/110
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/br101/horst/commit/c9e9b6cc1f97edb9c53f3a67b43f3588f3ac6ea7.patch";
sha256 = "15pahbnql44d5zzxmkd5ky8bl3c3hh3lh5190wynd90jrrhf1a26";
# collides for context change, well apply this part in postPatch
excludes = [ "display-main.c" ];
})
];
postPatch = ''
# Apply second part of ncurses-6.3.patch:
substituteInPlace display-main.c --replace 'wprintw(dump_win, str);' 'wprintw(dump_win, "%s", str);'
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses libnl ];