git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #146649 from trofi/fix-souffle-for-ncurses-6.3
36e26ceSandro
pkgs/development/compilers/souffle/default.nix+12−2
compare with master
unifiedsplit
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub
1+{ lib, stdenv, fetchFromGitHub, fetchpatch
2, perl, ncurses, zlib, sqlite, libffi
2, perl, ncurses, zlib, sqlite, libffi
3, autoreconfHook, mcpp, bison, flex, doxygen, graphviz
3, autoreconfHook, mcpp, bison, flex, doxygen, graphviz
4, makeWrapper
4, makeWrapper
@@ -19,6 +19,16 @@ stdenv.mkDerivation rec {
19 sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5";
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 nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ];
32 nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ];
23 buildInputs = [ ncurses zlib sqlite libffi ];
33 buildInputs = [ ncurses zlib sqlite libffi ];
24
34
@@ -29,7 +39,7 @@ stdenv.mkDerivation rec {
29
39
30 # see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for
40 # see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for
31 # Wno-error fixes
41 # Wno-error fixes
32− patchPhase = ''
42+ postPatch = ''
33 substituteInPlace ./src/Makefile.am \
43 substituteInPlace ./src/Makefile.am \
34 --replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other'
44 --replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other'
35
45