Skip to content

Commit e930a4d

Browse files
authored
daemontools: fix build with gcc14 (NixOS#368939)
2 parents 7355705 + 91be9cf commit e930a4d

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

pkgs/by-name/da/daemontools/package.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ stdenv.mkDerivation rec {
2222
sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5";
2323
};
2424

25-
patches = [ ./fix-nix-usernamespace-build.patch ];
25+
patches = [
26+
(fetchurl {
27+
url = "https://salsa.debian.org/debian/daemontools/-/raw/1844f0e704ab66844da14354a16ea068eba0403f/debian/patches/0005-fix-ftbfs.patch";
28+
hash = "sha256-Q7t0kwajjTW2Ms5m44E4spBwHi5Xi6Y39FQVsawr8LA=";
29+
})
30+
./fix-nix-usernamespace-build.patch
31+
];
2632

2733
outputs = [
2834
"out"
@@ -37,7 +43,7 @@ stdenv.mkDerivation rec {
3743
sed -i -e '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc
3844
3945
substituteInPlace src/Makefile \
40-
--replace '/bin/sh' '${bash}/bin/bash -oxtrace'
46+
--replace-fail '/bin/sh' '${bash}/bin/bash -oxtrace'
4147
4248
sed -i -e "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests
4349

0 commit comments

Comments
 (0)