git.iko.soy/typeable/nixpkgs
on master help sign in
uhd: remove and add TODO for old build fixes
commit6dc7131d26fe8bf4625f9fab1855a08d3c64f9e0 authorDoron Behar <doron.behar@gmail.com> dateMon 9 Mar 2020, 14:31 (7 years ago) parent7bbed32
1 file changed+3−1
pkgs/applications/radio/uhd/default.nix+3−1
pkgs/applications/radio/uhd/default.nix+3−1
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
3636 enableParallelBuilding = true;
3737
3838 cmakeFlags = [
39− "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"
4039 ]
40+ # TODO: Check if this still needed
4141 # ABI differences GCC 7.1
4242 # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1
4343 ++ [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
5656
5757 # Build only the host software
5858 preConfigure = "cd host";
59+ # TODO: Check if this still needed, perhaps relevant:
60+ # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm
5961 patches = if stdenv.isAarch32 then ./neon.patch else null;
6062
6163 postPhases = [ "installFirmware" ];