forked from mirrors/nixpkgs
openambit: pull upstream fix for -fno-common toolchains
Without the change build fails on upstream gcc-10 as: ld: CMakeFiles/ambit.dir/libambit.c.o:(.rodata+0x40): multiple definition of `ambit_waypoint_types_from_movescount'; CMakeFiles/ambit.dir/device_driver_ambit.c.o:(.rodata+0x20): first defined here
This commit is contained in:
parent
cb06de526c
commit
f01320c213
|
@ -1,5 +1,6 @@
|
|||
{ cmake
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, lib
|
||||
, libusb1
|
||||
, mkDerivation
|
||||
|
@ -21,6 +22,16 @@ mkDerivation rec {
|
|||
sha256 = "1074kvkamwnlkwdajsw1799wddcfkjh2ay6l842r0s4cvrxrai85";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream patch for -fno-common toolchain support:
|
||||
# https://github.com/openambitproject/openambit/pull/244
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/openambitproject/openambit/commit/b6d97eab417977b6dbe355e0b071d0a56cc3df6b.patch";
|
||||
sha256 = "1p0dg902mlcfjvs01dxl9wv2b50ayp4330p38d14q87mn0c2xl5d";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake qttools ];
|
||||
buildInputs = [ libusb1 python3 qtbase udev zlib ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue