Unverified Commit a904ff1f authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #190885 from hexagonal-sun/sdrangel-update

parents 26ce4349 8f25e21f

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -603,6 +603,12 @@ 
    githubId = 782180;

    name = "Alex Vorobiev";

  };

  alexwinter = {

    email = "git@alexwinter.net";

    github = "lxwntr";

    githubId = 50754358;

    name = "Alex Winter";

  };

  alexeyre = {

    email = "A.Eyre@sms.ed.ac.uk";

    github = "alexeyre";

pkgs/applications/radio/sdrangel/default.nix

+23 −2
Original line number Diff line number Diff line 
{ airspy

, airspyhf

, aptdec

, boost

, cm256cc

, cmake

, codec2

, dab_lib

, dsdcc

, faad2

, fetchFromGitHub

, fftwFloat

, glew

, hackrf

, hidapi

, lib

, ffmpeg

, libiio
@@ -15,6 +21,7 @@ 
, libusb1

, limesuite

, libbladeRF

, mbelib

, mkDerivation

, ocl-icd

, opencv3
@@ -25,21 +32,23 @@ 
, qtserialport

, qtspeech

, qtwebsockets

, qtwebengine

, rtl-sdr

, serialdv

, sgp4

, soapysdr-with-plugins

, uhd

}:



mkDerivation rec {

  pname = "sdrangel";

  version = "6.18.1";

  version = "7.6.3";



  src = fetchFromGitHub {

    owner = "f4exb";

    repo = "sdrangel";

    rev = "v${version}";

    sha256 = "sha256-gf+RUOcki0pi3UH4NHFsmbTV04HUG16UC4jcUjyeip4=";

    sha256 = "sha256-4o91vZnW5+wAKw4o3RrsS4gGVG0TyQCBcKg4GuE3n5s=";

    fetchSubmodules = false;

  };
@@ -47,19 +56,26 @@ mkDerivation rec { 


  buildInputs = [

    airspy

    airspyhf

    aptdec

    boost

    cm256cc

    codec2

    dab_lib

    dsdcc

    faad2

    ffmpeg

    fftwFloat

    glew

    hackrf

    hidapi

    libbladeRF

    libiio

    libopus

    libpulseaudio

    libusb1

    limesuite

    mbelib

    opencv3

    qtcharts

    qtlocation
@@ -67,16 +83,21 @@ mkDerivation rec { 
    qtserialport

    qtspeech

    qtwebsockets

    qtwebengine

    rtl-sdr

    serialdv

    sgp4

    soapysdr-with-plugins

    uhd

  ];



  cmakeFlags = [

    "-DAPT_DIR=${aptdec}"

    "-DDAB_LIB=${dab_lib}"

    "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"

    "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"

    "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so"

    "-DSGP4_DIR=${sgp4}"

    "-DSOAPYSDR_DIR=${soapysdr-with-plugins}"

  ];

pkgs/development/libraries/aptdec/default.nix

0 → 100644
+31 −0
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config

, libpng, libsndfile

}:



stdenv.mkDerivation {

  pname = "aptdec";

  version = "unstable-2022-05-18";



  src = fetchFromGitHub {

    owner = "Xerbo";

    repo = "aptdec";

    rev = "b1cc7480732349a7c772124f984b58f4c734c91b";

    sha256 = "sha256-Fi9IkZcvqxpmHzqucpCr++37bmTtMy18P4LPznoaYIY=";

  };



  # fixes https://github.com/Xerbo/aptdec/issues/15

  postPatch = ''

    substituteInPlace CMakeLists.txt --replace "-Werror" ""

  '';



  nativeBuildInputs = [ cmake pkg-config ];

  buildInputs = [ libpng libsndfile ];



  meta = with lib; {

    description = "NOAA APT satellite imagery decoding library";

    homepage = "https://github.com/Xerbo/aptdec";

    license = licenses.gpl2;

    maintainers = with maintainers; [ alexwinter ];

    platforms = platforms.linux;

  };

}

pkgs/development/libraries/dab_lib/default.nix

0 → 100644
+28 −0
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config

, faad2, fftwFloat, zlib

}:



stdenv.mkDerivation {

  pname = "dab_lib";

  version = "unstable-2021-12-28";



  src = fetchFromGitHub {

    owner = "JvanKatwijk";

    repo = "dab-cmdline";

    rev = "d23adb3616bb11d98a909aceecb5a3b9507a674c";

    sha256 = "sha256-n/mgsldgXEOLHZEL1cmsqXgFXByWoMeNXNoDWqPpipA=";

  };



  sourceRoot = "source/library/";



  nativeBuildInputs = [ cmake pkg-config ];

  buildInputs = [ faad2 fftwFloat zlib ];



  meta = with lib; {

    description = "DAB/DAB+ decoding library";

    homepage = "https://github.com/JvanKatwijk/dab-cmdline";

    license = licenses.gpl2;

    maintainers = with maintainers; [ alexwinter ];

    platforms = platforms.linux;

  };

}

pkgs/development/libraries/dsdcc/default.nix

0 → 100644
+30 −0
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config

, mbelib, serialdv

}:



stdenv.mkDerivation rec {

  pname = "dsdcc";

  version = "1.9.3";



  src = fetchFromGitHub {

    owner = "f4exb";

    repo = "dsdcc";

    rev = "v${version}";

    sha256 = "sha256-8lO2c4fkQCaVO8IM05+Rdpo6oMxoEIObBm0y08i+/0k=";

  };



  nativeBuildInputs = [ cmake pkg-config ];

  buildInputs = [ mbelib serialdv ];



  cmakeFlags = [

    "-DUSE_MBELIB=ON"

  ];



  meta = with lib; {

    description = "Digital Speech Decoder (DSD) rewritten as a C++ library";

    homepage = "https://github.com/f4exb/dsdcc";

    license = licenses.gpl3;

    maintainers = with maintainers; [ alexwinter ];

    platforms = platforms.linux;

  };

}