diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-03-09 14:16:25 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2020-04-05 10:35:22 +0200 |
| commit | 7bbed32888aa4aaa9f04c6dc52cb8fc04fc85c12 (patch) | |
| tree | 40c4cbfd476b3f6ba3c6dfb8f97ee4ddc0d9019d /pkgs/applications/radio/uhd/default.nix | |
| parent | b68894b2cfb34daba6f6a8c6eee78986a6a50278 (diff) | |
uhd: format arguments and inputs
Diffstat (limited to 'pkgs/applications/radio/uhd/default.nix')
| -rw-r--r-- | pkgs/applications/radio/uhd/default.nix | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index bf85ac5129147..76726012b68cb 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -1,5 +1,13 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig -, python, orc, libusb1, boost }: +{ stdenv +, fetchurl +, fetchFromGitHub +, cmake +, pkgconfig +, python +, orc +, libusb1 +, boost +}: # You need these udev rules to not have to run as root (copied from # ${uhd}/share/uhd/utils/uhd-usrp.rules): @@ -27,13 +35,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # 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 + cmakeFlags = [ + "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0" + ] + # 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") ] + ; - cmakeFlags = [ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"] ++ - [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]; - - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; buildInputs = [ (python.withPackages (ps: with ps; [ Mako six requests ])) orc |