git.iko.soy/typeable/nixpkgs
on master help sign in
uhd: format arguments and inputs
commit7bbed32888aa4aaa9f04c6dc52cb8fc04fc85c12 authorDoron Behar <doron.behar@gmail.com> dateMon 9 Mar 2020, 14:16 (7 years ago) parentb68894b
1 file changed+21−8
pkgs/applications/radio/uhd/default.nix+21−8
pkgs/applications/radio/uhd/default.nix+21−8
@@ -1,5 +1,13 @@
1−{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig
2−, python, orc, libusb1, boost }:
1+{ stdenv
2+, fetchurl
3+, fetchFromGitHub
4+, cmake
5+, pkgconfig
6+, python
7+, orc
8+, libusb1
9+, boost
10+}:
311
412# You need these udev rules to not have to run as root (copied from
513# ${uhd}/share/uhd/utils/uhd-usrp.rules):
@@ -27,13 +35,18 @@ stdenv.mkDerivation rec {
2735
2836 enableParallelBuilding = true;
2937
30− # ABI differences GCC 7.1
31− # /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
38+ cmakeFlags = [
39+ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"
40+ ]
41+ # ABI differences GCC 7.1
42+ # /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
43+ ++ [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]
44+ ;
3245
33− cmakeFlags = [ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"] ++
34− [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ];
35−
36− nativeBuildInputs = [ cmake pkgconfig ];
46+ nativeBuildInputs = [
47+ cmake
48+ pkgconfig
49+ ];
3750 buildInputs = [
3851 (python.withPackages (ps: with ps; [ Mako six requests ]))
3952 orc