diff options
author | markuskowa <markus.kowalewski@gmail.com> | 2019-08-12 13:12:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-12 13:12:42 +0200 |
commit | 45532916f01f7ad4f175a6c2e38302dd2d1516e9 (patch) | |
tree | 5f5f2b5c1dd87b934dde822f5bed8b32d56afe4f /pkgs/applications/radio | |
parent | e8016409bbbc40d3493f6d48fc9963f020003941 (diff) | |
parent | 1d428e869a141d06b53b3e39be7ca7e12c735213 (diff) | |
download | nixlib-45532916f01f7ad4f175a6c2e38302dd2d1516e9.tar nixlib-45532916f01f7ad4f175a6c2e38302dd2d1516e9.tar.gz nixlib-45532916f01f7ad4f175a6c2e38302dd2d1516e9.tar.bz2 nixlib-45532916f01f7ad4f175a6c2e38302dd2d1516e9.tar.lz nixlib-45532916f01f7ad4f175a6c2e38302dd2d1516e9.tar.xz nixlib-45532916f01f7ad4f175a6c2e38302dd2d1516e9.tar.zst nixlib-45532916f01f7ad4f175a6c2e38302dd2d1516e9.zip |
Merge pull request #66342 from markuskowa/upd-gnss
gnss-sdr: 0.0.9 -> 0.0.11
Diffstat (limited to 'pkgs/applications/radio')
-rw-r--r-- | pkgs/applications/radio/gnss-sdr/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 7e132efefbb1..747015d80eeb 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -11,17 +11,22 @@ , pkgconfig , pythonPackages , uhd +, log4cpp +, openblas +, matio +, pugixml +, protobuf }: stdenv.mkDerivation rec { name = "gnss-sdr-${version}"; - version = "0.0.9"; + version = "0.0.11"; src = fetchFromGitHub { owner = "gnss-sdr"; repo = "gnss-sdr"; rev = "v${version}"; - sha256 = "0gis932ly3vk7d5qvznffp54pkmbw3m6v60mxjfdj5dd3r7vf975"; + sha256 = "0ajj0wx68yyzigppxxa1wag3hzkrjj8dqq8k28rj0jhp8a6bw2q7"; }; buildInputs = [ @@ -40,6 +45,11 @@ stdenv.mkDerivation rec { # UHD support is optional, but gnuradio is built with it, so there's # nothing to be gained by leaving it out. uhd + log4cpp + openblas + matio + pugixml + protobuf ]; enableParallelBuilding = true; @@ -53,6 +63,8 @@ stdenv.mkDerivation rec { # armadillo is built using both, so skip checking for them. "-DBLAS=YES" "-DLAPACK=YES" + "-DBLAS_LIBRARIES=-lopenblas" + "-DLAPACK_LIBRARIES=-lopenblas" # Similarly, it doesn't actually use gfortran despite checking for # its presence. |