diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-11-13 10:22:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-13 10:22:01 +0000 |
| commit | 3adea51eb2a566d0ed8927d3b4e3925196941e79 (patch) | |
| tree | bd5c62e43fb4e496566579a17f30f6e4f6b748ff /pkgs | |
| parent | 9cae36cff14bfb48f9903143d393762b21357c33 (diff) | |
| parent | 50edfafdbfa12e7948ed2cfada23c3b85037e56c (diff) | |
Merge pull request #145531 from trofi/fix-pinfo-for-ncurses-6.3
pinfo: fix build for ncurses-6.3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/pinfo/default.nix | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index b0fc64a1a5e9..179af6ca87dc 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -1,6 +1,7 @@ { lib , autoreconfHook , fetchFromGitHub +, fetchpatch , gettext , ncurses , readline @@ -19,6 +20,31 @@ stdenv.mkDerivation rec { sha256 = "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/baszoetekouw/pinfo/commit/16dba5978146b6d3a540ac7c8f415eda49280847.patch"; + sha256 = "148fm32chvq8x9ayq9cnhgszh10g5v0cv0xph67fa7sp341p09wy"; + }) + + # Fix pending upstream inclusion for build on ncurses-6.3: + # https://github.com/baszoetekouw/pinfo/pull/27 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/baszoetekouw/pinfo/commit/fc67ceacd81f0c74fcab85447c23a532ae482827.patch"; + sha256 = "08phmng8vgfqjjazys05acpd5gh110malhw3sx29dg86nsrg2khs"; + }) + + # Fix pending upstream inclusion for build on gcc-11: + # https://github.com/baszoetekouw/pinfo/pull/27 + (fetchpatch { + name = "gcc-11.patch"; + url = "https://github.com/baszoetekouw/pinfo/commit/ab604fdb67296dad27f3a25f3c9aabdd2fb8c3fa.patch"; + sha256 = "09g8msgan2x48hxcbm7l6j3av6n8i0bsd4g0vf5xd8bxwzynb13m"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; |