colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uhd: format arguments and inputs

Browse Source
This commit is contained in:
Doron Behar 2020-03-09 14:16:25 +02:00 committed by Bjørn Forsman
parent b68894b2cf
commit 7bbed32888
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/applications/radio/uhd/default.nix
View File

@ -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