idsk, indi-full: more gcc12 fixups
This commit is contained in:
parent
7677b9afd0
commit
c2fb9453ab
2 changed files with 4 additions and 2 deletions
|
@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
|
||||||
--replace "/etc/udev/rules.d" "lib/udev/rules.d" \
|
--replace "/etc/udev/rules.d" "lib/udev/rules.d" \
|
||||||
--replace "/lib/firmware" "lib/firmware"
|
--replace "/lib/firmware" "lib/firmware"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
sed '1i#include <ctime>' -i indi-duino/libfirmata/src/firmata.cpp # gcc12
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
|
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = [
|
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
|
||||||
# Needed with GCC 12
|
# Needed with GCC 12 but breaks on darwin (with clang)
|
||||||
"-std=c++14"
|
"-std=c++14"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue