@@ -1,4 +1,4 @@
1−{ fetchFromGitHub, ncurses, lib, stdenv,
1+{ fetchFromGitHub, fetchpatch, ncurses, lib, stdenv,
22 updateAutotoolsGnuConfigScriptsHook }:
33
44stdenv.mkDerivation rec {
@@ -12,6 +12,25 @@ stdenv.mkDerivation rec {
1212 sha256 = "0grkwmz9whg1vlnk6gbr0vv9i2zgbd036182pk0xj4cavaj9rpjb";
1313 };
1414
15+ patches = [
16+ # Pull fix pending upstream inclusion for -fno-common toolchains
17+ # like upstream gcc-10+ or clang-13:
18+ # https://github.com/rwestlund/freesweep/pull/8
19+ (fetchpatch {
20+ name = "fno-common.patch";
21+ url = "https://github.com/rwestlund/freesweep/commit/a86245df4f3ff276a393f799d737d28a5cb0a5a8.patch";
22+ sha256 = "13gs3bjb68ixyn9micza7gjd489rd2f5pdrv6sip9fsa6ya29xky";
23+ })
24+
25+ # Pull fix pending upstream inclusion for ncurses-6.3:
26+ # https://github.com/rwestlund/freesweep/pull/10
27+ (fetchpatch {
28+ name = "ncurses-6.3.patch";
29+ url = "https://github.com/rwestlund/freesweep/commit/b0aef2bd0b2409d1e859af7d29bf2d86fc7bcea7.patch";
30+ sha256 = "1nzvmvxhjxgm8228h1zz16w62iy6lak5sibif1s1f6p1ssn659jp";
31+ })
32+ ];
33+
1534 nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
1635 buildInputs = [ ncurses ];
1736