JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #145531 from trofi/fix-pinfo-for-ncurses-6.3

Browse Source 
pinfo: fix build for ncurses-6.3
This commit is contained in:
Jörg Thalheim 2021-11-13 10:22:01 +00:00 committed by GitHub
commit 3adea51eb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/misc/pinfo/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, autoreconfHook , autoreconfHook
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, gettext , gettext
, ncurses , ncurses
, readline , readline
@ -19,6 +20,31 @@ stdenv.mkDerivation rec {
sha256 = "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy"; 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 = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
]; ];