From 2e15d8029327004174d9a56a6a1a447f568e5840 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 28 Dec 2024 22:25:39 +0100 Subject: [PATCH 1/2] daemontools: fix build with gcc14 We apply the patch from Debian, which can be seen here: https://salsa.debian.org/debian/daemontools/-/blob/af0077708b725300d7993b06dca9051e2dac48d9/debian/patches/0005-fix-ftbfs.patch Before figuring out that Debian already has the patch, I prepared the patch myself and ended up with basically the same changes. --- pkgs/by-name/da/daemontools/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/da/daemontools/package.nix b/pkgs/by-name/da/daemontools/package.nix index 378910c80778..996ec6f904b2 100644 --- a/pkgs/by-name/da/daemontools/package.nix +++ b/pkgs/by-name/da/daemontools/package.nix @@ -22,7 +22,13 @@ stdenv.mkDerivation rec { sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5"; }; - patches = [ ./fix-nix-usernamespace-build.patch ]; + patches = [ + (fetchurl { + url = "https://salsa.debian.org/debian/daemontools/-/raw/1844f0e704ab66844da14354a16ea068eba0403f/debian/patches/0005-fix-ftbfs.patch"; + hash = "sha256-Q7t0kwajjTW2Ms5m44E4spBwHi5Xi6Y39FQVsawr8LA="; + }) + ./fix-nix-usernamespace-build.patch + ]; outputs = [ "out" From 91be9cf29d07df8a363ac4442386f94609fee1ba Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 28 Dec 2024 22:26:03 +0100 Subject: [PATCH 2/2] daemontools: don't use deprecated substituteInPlace --replace --- pkgs/by-name/da/daemontools/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/da/daemontools/package.nix b/pkgs/by-name/da/daemontools/package.nix index 996ec6f904b2..e137079280e7 100644 --- a/pkgs/by-name/da/daemontools/package.nix +++ b/pkgs/by-name/da/daemontools/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { sed -i -e '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc substituteInPlace src/Makefile \ - --replace '/bin/sh' '${bash}/bin/bash -oxtrace' + --replace-fail '/bin/sh' '${bash}/bin/bash -oxtrace' sed -i -e "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests