daemontools: fix build with gcc14 (#368939)

This commit is contained in:
Emily
2024-12-29 13:18:30 +00:00
committed by GitHub
+8 -2
View File
@@ -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"
@@ -37,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