From 68652a1fa96f19eca25889e501a25c22861f4fa3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 15 Sep 2024 15:40:49 +0200 Subject: [PATCH] tcp_wrappers: 7.6.q-26 -> 7.6.q-33 Fixes building with GCC 14. postPatch is no longer necessary to avoid a build failure on musl. --- pkgs/os-specific/linux/tcp-wrappers/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index 92a6b328b2cc..ad8c8b8c2bbb 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -2,7 +2,7 @@ let vanillaVersion = "7.6.q"; - patchLevel = "26"; + patchLevel = "33"; in stdenv.mkDerivation rec { pname = "tcp-wrappers"; version = "${vanillaVersion}-${patchLevel}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { debian = fetchurl { url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}.debian.tar.xz"; - sha256 = "1dcdhi9lwzv7g19ggwxms2msq9fy14rl09rjqb10hwv0jix7z8j8"; + hash = "sha256-Lykjyu4hKDS/DqQ8JAFhKDffHrbJ9W1gjBKNpdaNRew="; }; prePatch = '' @@ -28,11 +28,6 @@ in stdenv.mkDerivation rec { # Fix __BEGIN_DECLS usage (even if it wasn't non-standard, this doesn't include sys/cdefs.h) patches = [ ./cdecls.patch ]; - postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace Makefile \ - --replace '-DNETGROUP' '-DUSE_GETDOMAIN' - ''; - buildInputs = [ libnsl ]; makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" "AR:=$(AR)" ];