diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-03-09 14:31:30 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2020-04-05 10:35:22 +0200 |
| commit | 6dc7131d26fe8bf4625f9fab1855a08d3c64f9e0 (patch) | |
| tree | 04e5be3781f17a77c9769d824cde8d7db26e8c5a /pkgs/applications/radio/uhd | |
| parent | 7bbed32888aa4aaa9f04c6dc52cb8fc04fc85c12 (diff) | |
uhd: remove and add TODO for old build fixes
Diffstat (limited to 'pkgs/applications/radio/uhd')
| -rw-r--r-- | pkgs/applications/radio/uhd/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 76726012b68cb..d289e7e3c71ac 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; cmakeFlags = [ - "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0" ] + # TODO: Check if this still needed # ABI differences GCC 7.1 # /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 ++ [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { # Build only the host software preConfigure = "cd host"; + # TODO: Check if this still needed, perhaps relevant: + # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm patches = if stdenv.isAarch32 then ./neon.patch else null; postPhases = [ "installFirmware" ]; |