sdrangel: 7.22.9 -> 7.27.1, satisfy more optional dependencies (#539009)
This commit is contained in:
@@ -0,0 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "ggmorse";
|
||||
version = "0.1.0-unstable-2024-05-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "ggmorse";
|
||||
rev = "8fb433d6cd6a71940f51b5724663ec0c75bf0b62";
|
||||
hash = "sha256-6GhyPhzNNAx1DSomfIfejbnLTckKa7/+VUZhSaGvGtI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required (VERSION 3.0)" \
|
||||
"cmake_minimum_required (VERSION 3.5)"
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "GGMORSE_BUILD_EXAMPLES" false)
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Morse code decoding library";
|
||||
homepage = "https://github.com/ggerganov/ggmorse";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.nekowinston ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "inmarsatc";
|
||||
version = "0-unstable-2023-07-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cropinghigh";
|
||||
repo = "inmarsatc";
|
||||
rev = "cda1242e79981d71cd8608e971c8dbc691942b10";
|
||||
hash = "sha256-UCmdHR9bSr1x4G0OP7n+o6pdS1thTl9hzH7YMykSiGw=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "C++ library with functions to receive Inmarsat-C signals";
|
||||
homepage = "https://github.com/cropinghigh/inmarsatc";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.nekowinston ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -12,16 +12,19 @@
|
||||
dsdcc,
|
||||
faad2,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fftwFloat,
|
||||
flac,
|
||||
ggmorse,
|
||||
glew,
|
||||
hackrf,
|
||||
hidapi,
|
||||
ffmpeg,
|
||||
inmarsatc,
|
||||
libiio,
|
||||
libogg,
|
||||
libopus,
|
||||
libpulseaudio,
|
||||
libunwind,
|
||||
libusb1,
|
||||
limesuite,
|
||||
libbladeRF,
|
||||
@@ -31,6 +34,7 @@
|
||||
pkg-config,
|
||||
qt6,
|
||||
qt6Packages,
|
||||
rnnoise,
|
||||
rtl-sdr,
|
||||
serialdv,
|
||||
sdrplay,
|
||||
@@ -39,26 +43,22 @@
|
||||
uhd,
|
||||
zlib,
|
||||
withSDRplay ? false,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sdrangel";
|
||||
version = "7.22.9";
|
||||
version = "7.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f4exb";
|
||||
repo = "sdrangel";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VYSM9ldzx/8tWKQb++qGROSXdeEXIDhGqnnHUmkW4+k=";
|
||||
hash = "sha256-rdPXqA0ySnqh/rlMlfcDLyAd6egbggWHrRQRnXeQPFM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with Qt 6.10, remove when the commit reaches a release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/f4exb/sdrangel/commit/fd6a8d51f8c39fd31b4e864f528bf1921ebd4260.patch";
|
||||
hash = "sha256-S8LQbCTEgyEt1wByDsDMqqyQjK5HALtvUIODgQ1skSA=";
|
||||
})
|
||||
];
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -80,11 +80,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ffmpeg
|
||||
fftwFloat
|
||||
flac
|
||||
ggmorse
|
||||
glew
|
||||
hackrf
|
||||
hidapi
|
||||
libbladeRF
|
||||
libiio
|
||||
libogg
|
||||
libopus
|
||||
libpulseaudio
|
||||
libusb1
|
||||
@@ -101,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6Packages.qtspeech
|
||||
qt6Packages.qttools
|
||||
qt6Packages.qtwebsockets
|
||||
qt6Packages.qtwebengine
|
||||
rnnoise
|
||||
rtl-sdr
|
||||
serialdv
|
||||
sgp4
|
||||
@@ -109,18 +111,25 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
uhd
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
inmarsatc
|
||||
libunwind
|
||||
qt6Packages.qtwayland
|
||||
qt6Packages.qtwebengine
|
||||
]
|
||||
++ lib.optionals withSDRplay [ sdrplay ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DAPT_DIR=${aptdec}"
|
||||
"-DDAB_DIR=${dab_lib}"
|
||||
"-DSGP4_DIR=${sgp4}"
|
||||
"-DSOAPYSDR_DIR=${soapysdr-with-plugins}"
|
||||
(lib.cmakeFeature "APT_DIR" aptdec.outPath)
|
||||
(lib.cmakeFeature "DAB_DIR" dab_lib.outPath)
|
||||
(lib.cmakeFeature "SGP4_DIR" sgp4.outPath)
|
||||
(lib.cmakeFeature "SOAPYSDR_DIR" soapysdr-with-plugins.outPath)
|
||||
(lib.cmakeBool "ENABLE_QT6" true)
|
||||
"-Wno-dev"
|
||||
"-DENABLE_QT6=ON"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Software defined radio (SDR) software";
|
||||
homepage = "https://github.com/f4exb/sdrangel";
|
||||
|
||||
Reference in New Issue
Block a user