pyrox.dev
lol
souffle: pull pending upstream inclusion fix for ncurses-6.3
Without the fix build on ncurses-6.3 fails as:
src/include/souffle/provenance/Explain.h:522:18: error: format not a string literal and no format arguments [-Werror=format-security]
522 | mvwprintw(queryWindow, 1, 0, prompt.c_str());
| ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+12
-2
pkgs/development/compilers/souffle/default.nix
+12
-2
pkgs/development/compilers/souffle/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub
1
+
{ lib, stdenv, fetchFromGitHub, fetchpatch
2
2
, perl, ncurses, zlib, sqlite, libffi
3
3
, autoreconfHook, mcpp, bison, flex, doxygen, graphviz
4
4
, makeWrapper
···
19
19
sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5";
20
20
};
21
21
22
+
patches = [
23
+
# Pull pending unstream inclusion fix for ncurses-6.3:
24
+
# https://github.com/souffle-lang/souffle/pull/2134
25
+
(fetchpatch {
26
+
name = "ncurses-6.3.patch";
27
+
url = "https://github.com/souffle-lang/souffle/commit/9e4bdf86d051ef2e1b1a1be64aff7e498fd5dd20.patch";
28
+
sha256 = "0jw1b6qfdf49dx2qlzn1b2yzrgpnkil4w9y3as1m28w8ws7iphpa";
29
+
})
30
+
];
31
+
22
32
nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ];
23
33
buildInputs = [ ncurses zlib sqlite libffi ];
24
34
···
29
39
30
40
# see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for
31
41
# Wno-error fixes
32
-
patchPhase = ''
42
+
postPatch = ''
33
43
substituteInPlace ./src/Makefile.am \
34
44
--replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other'
35
45