From 33c369df8f561d0a10256b9034d9da96e0525822 Mon Sep 17 00:00:00 2001 From: Tungsten842 <886724vf@anonaddy.me> Date: Thu, 16 Mar 2023 20:52:40 +0100 Subject: [PATCH] sdrangel: add missing dependencies and fix DAB demodulator --- pkgs/applications/radio/sdrangel/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 392088eca95f..556ca1978c81 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -23,14 +23,20 @@ , libbladeRF , mbelib , mkDerivation +, ninja , ocl-icd , opencv3 , pkg-config , qtcharts +, qtdeclarative +, qtgraphicaleffects , qtlocation , qtmultimedia +, qtquickcontrols +, qtquickcontrols2 , qtserialport , qtspeech +, qttools , qtwebsockets , qtwebengine , rtl-sdr @@ -38,6 +44,7 @@ , sgp4 , soapysdr-with-plugins , uhd +, zlib }: mkDerivation rec { @@ -48,10 +55,10 @@ mkDerivation rec { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-hsYt7zGG6CSWeQ9A3GPt65efjZGPu33O5pIhnZjFgmY="; + hash = "sha256-hsYt7zGG6CSWeQ9A3GPt65efjZGPu33O5pIhnZjFgmY="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ airspy @@ -77,10 +84,15 @@ mkDerivation rec { mbelib opencv3 qtcharts + qtdeclarative + qtgraphicaleffects qtlocation qtmultimedia + qtquickcontrols + qtquickcontrols2 qtserialport qtspeech + qttools qtwebsockets qtwebengine rtl-sdr @@ -88,11 +100,12 @@ mkDerivation rec { sgp4 soapysdr-with-plugins uhd + zlib ]; cmakeFlags = [ "-DAPT_DIR=${aptdec}" - "-DDAB_LIB=${dab_lib}" + "-DDAB_INCLUDE_DIR:PATH=${dab_lib}/include/dab_lib" "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv" "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include" "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so"