From ba898ae44c12c8b8f55a117596440fdc68de504e Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 4 Nov 2020 23:26:33 +0100
Subject: [PATCH] sdrangel: 4.11.12 -> 4.21.1
---
pkgs/applications/radio/sdrangel/default.nix | 29 ++++++++------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix
index 6d0a19334dec..dd8c56610c28 100644
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@@ -13,47 +13,40 @@ libav,
libiio,
libopus,
libpulseaudio,
-libusb-compat-0_1,
+libusb1,
limesuite,
+libbladeRF,
mkDerivation,
ocl-icd,
opencv3,
pkgconfig,
qtbase,
qtmultimedia,
+qtserialport,
qtwebsockets,
rtl-sdr,
-serialdv
+serialdv,
+uhd
}:
-let
-
- codec2' = codec2.overrideAttrs (old: {
- src = fetchFromGitHub {
- owner = "drowe67";
- repo = "codec2";
- rev = "567346818c0d4d697773cf66d925fdb031e15668";
- sha256 = "0ngqlh2cw5grx2lg7xj8baz6p55gfhq4caggxkb4pxlg817pwbpa";
- };
- });
-
-in mkDerivation rec {
+mkDerivation rec {
pname = "sdrangel";
- version = "4.11.12";
+ version = "4.21.1";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
- sha256 = "0zbx0gklylk8npb3wnnmqpam0pdxl40f20i3wzwwh4gqrppxywzx";
+ sha256 = "y6BVwnSJXiapgm9pAuby1DLLeU5MSyB4uqEa3oS35/U=";
fetchSubmodules = false;
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
- glew opencv3 libusb-compat-0_1 boost libopus limesuite libav libiio libpulseaudio
+ glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio
qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf
- fftwFloat codec2' cm256cc serialdv
+ fftwFloat codec2 cm256cc serialdv qtserialport
+ libbladeRF uhd
];
cmakeFlags = [
"-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"