Skip to content

Commit 2b82ae0

Browse files
authored
netboot: unbreak GCC 14, modernize (#394375)
2 parents a7bd107 + 4e7642c commit 2b82ae0

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

pkgs/by-name/ne/netboot/package.nix

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
bison,
66
lzo,
77
db4,
8+
versionCheckHook,
89
}:
910

10-
stdenv.mkDerivation rec {
11+
stdenv.mkDerivation (finalAttrs: {
1112
pname = "netboot";
1213
version = "0.10.2";
1314

1415
src = fetchurl {
15-
url = "mirror://sourceforge/netboot/netboot-${version}.tar.gz";
16-
sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0";
16+
url = "mirror://sourceforge/netboot/netboot-${finalAttrs.version}.tar.gz";
17+
hash = "sha256-4HFIsMOW+owsVCOZt5pq2q+oRoS5fAmR/R2sx/dKgCc=";
1718
};
1819

1920
buildInputs = [
@@ -24,17 +25,25 @@ stdenv.mkDerivation rec {
2425

2526
hardeningDisable = [ "format" ];
2627

28+
# mgllex.l:398:53: error: passing argument 1 of 'copy_string' from incompatible pointer type []
29+
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
30+
2731
# Disable parallel build, errors:
2832
# link: `parseopt.lo' is not a valid libtool object
2933
enableParallelBuilding = false;
3034

31-
meta = with lib; {
35+
nativeInstallCheckInputs = [ versionCheckHook ];
36+
versionCheckProgram = "${placeholder "out"}/bin/nbdbtool";
37+
versionCheckProgramArg = "--version";
38+
doInstallCheck = true;
39+
40+
meta = {
3241
description = "Mini PXE server";
33-
maintainers = [ maintainers.raskin ];
42+
maintainers = with lib.maintainers; [ raskin ];
3443
platforms = [
3544
"x86_64-linux"
3645
"aarch64-linux"
3746
];
38-
license = lib.licenses.free;
47+
license = lib.licenses.gpl2Only;
3948
};
40-
}
49+
})

0 commit comments

Comments
 (0)