nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-06-05 21:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

gen6dns: fix build with gcc15

Browse Source
This commit is contained in:
Xiangyan Sun
2026-05-06 21:43:13 -07:00
parent f88215e151
commit 4b11d9e205
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/by-name/ge/gen6dns/fix-gcc15.patch Normal file
View File

@@ -0,0 +1,24 @@
diff --git a/parse.c b/parse.c
index d4bb28b..90a307d 100644
--- a/parse.c
+++ b/parse.c
@@ -43,7 +43,7 @@ static int parsehostline (const char *line, host_t *h, ip6_t *hid, ip6_t *sid, c
static int parseextralines (FILE *fp, int *lnrp, char *extra_rr, size_t len);
static void dumphostline (FILE *fp, const host_t *host, const ip6_t *hid, const ip6_t *sid, const char *scope);
-int parsefile (const char *fname, FILE *outfp, int (*genfunc)())
+int parsefile (const char *fname, FILE *outfp, int (*genfunc)(int type, const ip6_t *prfx, const scope_t *scope, const host_t *host, const ip6_t *hid, ip6_t *sid, const char *extra_rr))
{
char extra_rr[MAXEXTRARR+1];
char line[MAXLINE+1];
diff --git a/parse.h b/parse.h
index 10e7997..fbb452d 100644
--- a/parse.h
+++ b/parse.h
@@ -7,5 +7,5 @@
# define MAXLINE 511
# define MAXEXTRARR (3*MAXLINE)
-extern int parsefile (const char *fname, FILE *outfp, int (*genfunc)());
+extern int parsefile (const char *fname, FILE *outfp, int (*genfunc)(int type, const ip6_t *prfx, const scope_t *scope, const host_t *host, const ip6_t *hid, ip6_t *sid, const char *extra_rr));
#endif

4
pkgs/by-name/ge/gen6dns/package.nix
View File

@@ -14,6 +14,10 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-MhYfgzbGPmrhPx89EpObrEkxaII7uz4TbWXeEGF7Xws=";
};
patches = [
./fix-gcc15.patch
];
nativeBuildInputs = [ installShellFiles ];
preInstall = ''