Skip to content

Commit

Permalink
sdrpp: 1.0.4 -> 1.1.0-20240116
Browse files Browse the repository at this point in the history
sdrpp switched to a rolling release, so take a git hash from head.
  • Loading branch information
hzeller committed Jan 21, 2024
1 parent 4253fc8 commit bb829fd
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 12 deletions.
27 changes: 17 additions & 10 deletions pkgs/applications/radio/sdrpp/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
, libX11, glfw, glew, fftwFloat, volk, AppKit
, libX11, glfw, glew, fftwFloat, volk, zstd, AppKit
# Sources
, airspy_source ? true, airspy
, airspyhf_source ? true, airspyhf
, bladerf_source ? false, libbladeRF
, bladerf_source ? true, libbladeRF
, file_source ? true
, hackrf_source ? true, hackrf
, limesdr_source ? false, limesuite
, sddc_source ? false
, limesdr_source ? true, limesuite
, rtl_sdr_source ? true, rtl-sdr, libusb1
, rtl_tcp_source ? true
, sdrplay_source ? false, sdrplay
Expand All @@ -23,7 +22,7 @@
, m17_decoder ? false, codec2
, meteor_demodulator ? true
, radio ? true
, weather_sat_decoder ? true
, weather_sat_decoder ? false # is missing some dsp/pll.h
# Misc
, discord_presence ? true
, frequency_manager ? true
Expand All @@ -33,13 +32,19 @@

stdenv.mkDerivation rec {
pname = "sdrpp";
version = "1.0.4";

# SDR++ uses a rolling release model.
# Choose a git hash from head and use the date from that commit as
# version qualifier
git_hash = "052167962dbf9adc2a02825f2f428e7613255d50";
git_date = "20240116";
version = "1.1.0-" + git_date;

src = fetchFromGitHub {
owner = "AlexandreRouma";
repo = "SDRPlusPlus";
rev = version;
hash = "sha256-g9tpWvVRMXRhPfgvOeJhX6IMouF9+tLUr9wo5r35i/c=";
rev = git_hash;
hash = "sha256-SZzKU+0e1A1Tfhs9ap1FkKyIEPQDOQ8phndFArXtfSQ=";
};

patches = [ ./runtime-prefix.patch ];
Expand All @@ -50,11 +55,14 @@ stdenv.mkDerivation rec {
--replace "set(CMAKE_INSTALL_PREFIX" "#set(CMAKE_INSTALL_PREFIX"
substituteInPlace decoder_modules/m17_decoder/src/m17dsp.h \
--replace "codec2.h" "codec2/codec2.h"
# Since the __TIME_ and __DATE__ is canonicalized in the build, add
# use our qualified version shown in the programs window title.
substituteInPlace core/src/version.h --replace "1.1.0" "$version"
'';

nativeBuildInputs = [ cmake pkg-config ];

buildInputs = [ glfw glew fftwFloat volk ]
buildInputs = [ glfw glew fftwFloat volk zstd ]
++ lib.optional stdenv.isDarwin AppKit
++ lib.optional stdenv.isLinux libX11
++ lib.optional airspy_source airspy
Expand All @@ -77,7 +85,6 @@ stdenv.mkDerivation rec {
OPT_BUILD_FILE_SOURCE = file_source;
OPT_BUILD_HACKRF_SOURCE = hackrf_source;
OPT_BUILD_LIMESDR_SOURCE = limesdr_source;
OPT_BUILD_SDDC_SOURCE = sddc_source;
OPT_BUILD_RTL_SDR_SOURCE = rtl_sdr_source;
OPT_BUILD_RTL_TCP_SOURCE = rtl_tcp_source;
OPT_BUILD_SDRPLAY_SOURCE = sdrplay_source;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24914,9 +24914,9 @@ with pkgs;

sdrplay = callPackage ../applications/radio/sdrplay { };

sdrpp = pin-to-gcc12-if-gcc13 (callPackage ../applications/radio/sdrpp {
sdrpp = callPackage ../applications/radio/sdrpp {
inherit (darwin.apple_sdk.frameworks) AppKit;
});
};

sigdigger = libsForQt5.callPackage ../applications/radio/sigdigger { };

Expand Down

0 comments on commit bb829fd

Please sign in to comment.