pyrox.dev / nixpkgs
lol
fork atom

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

authored by

Sergei Trofimovich and committed by
Robert Helgesson f01320c2 cb06de52

+11
unified split
+11
pkgs/applications/misc/openambit/default.nix
··· 1 { cmake 2 , fetchFromGitHub 3 , lib 4 , libusb1 5 , mkDerivation ··· 20 rev = version; 21 sha256 = "1074kvkamwnlkwdajsw1799wddcfkjh2ay6l842r0s4cvrxrai85"; 22 }; 23 24 nativeBuildInputs = [ cmake qttools ]; 25 buildInputs = [ libusb1 python3 qtbase udev zlib ];
··· 1 { cmake 2 , fetchFromGitHub 3 + , fetchpatch 4 , lib 5 , libusb1 6 , mkDerivation ··· 21 rev = version; 22 sha256 = "1074kvkamwnlkwdajsw1799wddcfkjh2ay6l842r0s4cvrxrai85"; 23 }; 24 + 25 + patches = [ 26 + # Pull upstream patch for -fno-common toolchain support: 27 + # https://github.com/openambitproject/openambit/pull/244 28 + (fetchpatch { 29 + name = "fno-common.patch"; 30 + url = "https://github.com/openambitproject/openambit/commit/b6d97eab417977b6dbe355e0b071d0a56cc3df6b.patch"; 31 + sha256 = "1p0dg902mlcfjvs01dxl9wv2b50ayp4330p38d14q87mn0c2xl5d"; 32 + }) 33 + ]; 34 35 nativeBuildInputs = [ cmake qttools ]; 36 buildInputs = [ libusb1 python3 qtbase udev zlib ];