pyrox.dev
Merge pull request #144304 from trofi/fix-tty-solitaire-on-ncurses-6.3
tty-solitaire: fix build against upcoming ncurses-6.3
authored by
Anderson Torres
and committed by
GitHub
946ea034
8c4636e1
+15
-3
pkgs/applications/misc/tty-solitaire/default.nix
+15
-3
pkgs/applications/misc/tty-solitaire/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, ncurses }:
2
3
stdenv.mkDerivation rec {
4
pname = "tty-solitaire";
···
11
sha256 = "sha256-zMLNWJieHxHALFQoSkdAxGbUBGuZnznLX86lI3P21F0=";
12
};
13
14
-
buildInputs = [ ncurses ];
15
16
-
patchPhase = "sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile";
17
18
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=${placeholder "out"}" ];
19
···
1
+
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses }:
2
3
stdenv.mkDerivation rec {
4
pname = "tty-solitaire";
···
11
sha256 = "sha256-zMLNWJieHxHALFQoSkdAxGbUBGuZnznLX86lI3P21F0=";
12
};
13
14
+
patches = [
15
+
# Patch pending upstream inclusion to support ncurses-6.3:
16
+
# https://github.com/mpereira/tty-solitaire/pull/61
17
+
(fetchpatch {
18
+
name = "ncurses-6.3.patch";
19
+
url = "https://github.com/mpereira/tty-solitaire/commit/4d066c564d086ce272b78cb8f80717a7fb83c261.patch";
20
+
sha256 = "sha256-E1XVG0be6JH3K1y7UPap93s8xk8Nk0dKLdKHcJ7mA8E=";
21
+
})
22
+
];
23
24
+
postPatch = ''
25
+
sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile
26
+
'';
27
+
28
+
buildInputs = [ ncurses ];
29
30
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=${placeholder "out"}" ];
31