From 6dc7131d26fe8bf4625f9fab1855a08d3c64f9e0 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 9 Mar 2020 14:31:30 +0200 Subject: [PATCH] uhd: remove and add TODO for old build fixes --- pkgs/applications/radio/uhd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 76726012b68c..d289e7e3c71a 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::iterator {aka __gnu_cxx::__normal_iterator >}' 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" ];