From 1d428e869a141d06b53b3e39be7ca7e12c735213 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 8 Aug 2019 22:11:41 +0200 Subject: [PATCH] gnss-sdr: 0.0.9 -> 0.0.11 --- pkgs/applications/radio/gnss-sdr/default.nix | 16 ++++++++++++++-- 1 file 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.