diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-05-22 18:13:55 +0100 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2022-05-23 01:03:12 +0200 |
| commit | f01320c21335bf2e240ce3b75e94ac33dfcb7fbd (patch) | |
| tree | e291c4029413df7eca1a3c81f53605ce7198522e | |
| parent | cb06de526c36c799ab8a61c4d5612b7903434ab9 (diff) | |
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
| -rw-r--r-- | pkgs/applications/misc/openambit/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/applications/misc/openambit/default.nix b/pkgs/applications/misc/openambit/default.nix index 5ef6d4ae84d4..f3429a05ee6e 100644 --- a/pkgs/applications/misc/openambit/default.nix +++ b/pkgs/applications/misc/openambit/default.nix @@ -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 ]; |