pyrox.dev
Merge pull request #262660 from reckenrode/invidious-fix
invidious: fix build with clang 16
authored by Weijia Wang and committed by GitHub 763fc7d8 def24391
+19
-1
pkgs/servers/invidious/lsquic.nix
+19
-1
pkgs/servers/invidious/lsquic.nix
···
57
57
preBuild = preBuild + lib.optionalString stdenv.isLinux ''
58
58
sed -e '/^build crypto\/fipsmodule\/CMakeFiles\/fipsmodule\.dir\/bcm\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=stringop-overflow/' \
59
59
-i build.ninja
60
-
'';
60
+
'' + lib.optionalString stdenv.cc.isGNU ''
61
+
# Silence warning that causes build failures with GCC.
62
+
sed -e '/^build ssl\/test\/CMakeFiles\/bssl_shim\.dir\/settings_writer\.cc\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=ignored-attributes/' \
63
+
-e '/^build ssl\/test\/CMakeFiles\/handshaker\.dir\/settings_writer\.cc\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=ignored-attributes/' \
64
+
-i build.ninja
65
+
'' + lib.optionalString stdenv.cc.isClang (
66
+
# Silence warnings that cause build failures with newer versions of clang.
67
+
let
68
+
clangVersion = lib.getVersion stdenv.cc;
69
+
in
70
+
lib.optionalString (lib.versionAtLeast clangVersion "13") ''
71
+
sed -e '/^build crypto\/CMakeFiles\/crypto\.dir\/x509\/t_x509\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=unused-but-set-variable/' \
72
+
-e '/^build tool\/CMakeFiles\/bssl\.dir\/digest\.cc\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=unused-but-set-variable/' \
73
+
-i build.ninja
74
+
'' + lib.optionalString (lib.versionAtLeast clangVersion "16") ''
75
+
sed -e '/^build crypto\/CMakeFiles\/crypto\.dir\/trust_token\/trust_token\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=single-bit-bitfield-constant-conversion/' \
76
+
-i build.ninja
77
+
''
78
+
);
61
79
});
62
80
in
63
81
stdenv.mkDerivation rec {