Unverified Commit c97de213 authored by markuskowa's avatar markuskowa Committed by GitHub
Browse files

Merge pull request #198852 from wegank/lpcnetfreedv-0.2 

freedv: 1.8.3.1 -> 1.8.4
parents f627f3a2 30507f88

pkgs/applications/radio/freedv/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ 


stdenv.mkDerivation rec {

  pname = "freedv";

  version = "1.8.3.1";

  version = "1.8.4";



  src = fetchFromGitHub {

    owner = "drowe67";

    repo = "freedv-gui";

    rev = "v${version}";

    hash = "sha256-LPCY5gPinxJkfPfumKggI/JQorcW+Qw/ZAP6XQmPkeA=";

    hash = "sha256-X/jL6q2yLNtRq7Xg9JeXu1zXD0KCs59D1poA9hM3Ndo=";

  };



  postPatch = lib.optionalString stdenv.isDarwin ''
@@ -58,12 +58,15 @@ stdenv.mkDerivation rec { 
  cmakeFlags = [

    "-DUSE_INTERNAL_CODEC2:BOOL=FALSE"

    "-DUSE_STATIC_DEPS:BOOL=FALSE"

    "-DUNITTEST=ON"

  ] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ];



  NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [

    "-DAPPLE_OLD_XCODE"

  ];



  doCheck = true;



  meta = with lib; {

    homepage = "https://freedv.org/";

    description = "Digital voice for HF radio";

pkgs/development/libraries/codec2/default.nix

+14 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake }:

{ lib

, stdenv

, fetchFromGitHub

, cmake

, freedvSupport ? false

, lpcnetfreedv

, codec2

}:



stdenv.mkDerivation rec {

  pname = "codec2";
@@ -13,6 +20,10 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [ cmake ];



  buildInputs = lib.optionals freedvSupport [

    lpcnetfreedv

  ];



  # Install a binary that is used by openwebrx

  postInstall = ''

    install -Dm0755 src/freedv_rx -t $out/bin/
@@ -26,6 +37,8 @@ stdenv.mkDerivation rec { 
  cmakeFlags = [

    # RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/

    "-DCMAKE_SKIP_BUILD_RPATH=ON"

  ] ++ lib.optionals freedvSupport [

    "-DLPCNET=ON"

  ];



  meta = with lib; {

pkgs/development/libraries/lpcnetfreedv/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -4,21 +4,21 @@ let 
  dataVersion = "191005_v1.0";

  data = fetchurl {

    url = "http://rowetel.com/downloads/deep/lpcnet_${dataVersion}.tgz";

    sha256 = "1j1695hm2pg6ri611f9kr3spm4yxvpikws55z9zxizai8y94152h";

    sha256 = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg=";

  };

in stdenv.mkDerivation rec {

in

stdenv.mkDerivation rec {

  pname = "lpcnetfreedv";

  version = "unstable-2021-06-29";

  version = "unstable-2022-08-22";



  src = fetchFromGitHub {

    owner = "drowe67";

    repo = "LPCNet";

    rev = "0dc5935bbf49ff3ba3c9654cc2f802838ebbaead";

    sha256 = "0r6488z40fkar11ync8achpg5l6qz7y7cbh7cs3b3w4fsxn58q9i";

    rev = "67a6eb74d0c07faddcdce199856862cc45779d25";

    sha256 = "sha256-eHYZoDgoZBuuLvQn9X7H/zmK5onOAniOgY1/8RVn8gk=";

  };



  nativeBuildInputs = [ cmake ];

  buildInputs = [ codec2 ];



  postPatch = ''

    mkdir build

pkgs/top-level/all-packages.nix

+3 −0
Original line number Diff line number Diff line
@@ -28644,6 +28644,9 @@ with pkgs; 














  freedv = callPackage ../applications/radio/freedv {















    inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia;













    codec2 = codec2.override {













      freedvSupport = true;













    };















  };





























  freemind = callPackage ../applications/misc/freemind {