diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-11-19 17:51:27 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-11-19 17:53:24 +0000 |
| commit | e371ffc4a7670e23fcd2f7c8a29a9b0d8b4d26ef (patch) | |
| tree | c95510e1d4e2226a55198336e544049586ff62b3 | |
| parent | 293e6f0ce5e0db0cbc7ba783c0b3ff31293f3d8f (diff) | |
| download | nixpkgs-e371ffc4a7670e23fcd2f7c8a29a9b0d8b4d26ef.tar nixpkgs-e371ffc4a7670e23fcd2f7c8a29a9b0d8b4d26ef.tar.gz nixpkgs-e371ffc4a7670e23fcd2f7c8a29a9b0d8b4d26ef.tar.bz2 nixpkgs-e371ffc4a7670e23fcd2f7c8a29a9b0d8b4d26ef.tar.lz nixpkgs-e371ffc4a7670e23fcd2f7c8a29a9b0d8b4d26ef.tar.xz nixpkgs-e371ffc4a7670e23fcd2f7c8a29a9b0d8b4d26ef.tar.zst nixpkgs-e371ffc4a7670e23fcd2f7c8a29a9b0d8b4d26ef.zip | |
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());
| ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| -rw-r--r-- | pkgs/development/compilers/souffle/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index e57062642ba..dada4dfe9e8 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , perl, ncurses, zlib, sqlite, libffi , autoreconfHook, mcpp, bison, flex, doxygen, graphviz , makeWrapper @@ -19,6 +19,16 @@ stdenv.mkDerivation rec { sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5"; }; + patches = [ + # Pull pending unstream inclusion fix for ncurses-6.3: + # https://github.com/souffle-lang/souffle/pull/2134 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/souffle-lang/souffle/commit/9e4bdf86d051ef2e1b1a1be64aff7e498fd5dd20.patch"; + sha256 = "0jw1b6qfdf49dx2qlzn1b2yzrgpnkil4w9y3as1m28w8ws7iphpa"; + }) + ]; + nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; buildInputs = [ ncurses zlib sqlite libffi ]; @@ -29,7 +39,7 @@ stdenv.mkDerivation rec { # see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for # Wno-error fixes - patchPhase = '' + postPatch = '' substituteInPlace ./src/Makefile.am \ --replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other' |