pyrox.dev
Merge pull request #145881 from trofi/fix-hirst-for-ncurses-6.3
host: pull pending upstream inclusion fix for ncurses-6.3
authored by Jörg Thalheim and committed by GitHub e4c43ce8 5fde0839
+17
-1
pkgs/tools/networking/horst/default.nix
+17
-1
pkgs/tools/networking/horst/default.nix
···
1
-
{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }:
1
+
{lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, ncurses, libnl }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "horst";
···
10
10
rev = "v${version}";
11
11
sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a";
12
12
};
13
+
14
+
patches = [
15
+
# Fix pending upstream inclusion for ncurses-6.3:
16
+
# https://github.com/br101/horst/pull/110
17
+
(fetchpatch {
18
+
name = "ncurses-6.3.patch";
19
+
url = "https://github.com/br101/horst/commit/c9e9b6cc1f97edb9c53f3a67b43f3588f3ac6ea7.patch";
20
+
sha256 = "15pahbnql44d5zzxmkd5ky8bl3c3hh3lh5190wynd90jrrhf1a26";
21
+
# collides for context change, well apply this part in postPatch
22
+
excludes = [ "display-main.c" ];
23
+
})
24
+
];
25
+
postPatch = ''
26
+
# Apply second part of ncurses-6.3.patch:
27
+
substituteInPlace display-main.c --replace 'wprintw(dump_win, str);' 'wprintw(dump_win, "%s", str);'
28
+
'';
13
29
14
30
nativeBuildInputs = [ pkg-config ];
15
31
buildInputs = [ ncurses libnl ];