Merge pull request #144969 from trofi/fix-freesweep-for-ncurses-6.13

This commit is contained in:
Artturi 2021-11-30 20:51:11 +02:00 committed by GitHub
commit 47291630c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, ncurses, lib, stdenv,
{ fetchFromGitHub, fetchpatch, ncurses, lib, stdenv,
updateAutotoolsGnuConfigScriptsHook }:
stdenv.mkDerivation rec {
@ -12,6 +12,25 @@ stdenv.mkDerivation rec {
sha256 = "0grkwmz9whg1vlnk6gbr0vv9i2zgbd036182pk0xj4cavaj9rpjb";
};
patches = [
# Pull fix pending upstream inclusion for -fno-common toolchains
# like upstream gcc-10+ or clang-13:
# https://github.com/rwestlund/freesweep/pull/8
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/rwestlund/freesweep/commit/a86245df4f3ff276a393f799d737d28a5cb0a5a8.patch";
sha256 = "13gs3bjb68ixyn9micza7gjd489rd2f5pdrv6sip9fsa6ya29xky";
})
# Pull fix pending upstream inclusion for ncurses-6.3:
# https://github.com/rwestlund/freesweep/pull/10
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/rwestlund/freesweep/commit/b0aef2bd0b2409d1e859af7d29bf2d86fc7bcea7.patch";
sha256 = "1nzvmvxhjxgm8228h1zz16w62iy6lak5sibif1s1f6p1ssn659jp";
})
];
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
buildInputs = [ ncurses ];