From 3f25fcd6602920c290aff915c78538bc32e3caa5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 1 Nov 2022 01:53:25 +0100 Subject: codec2: add freedv support --- pkgs/development/libraries/codec2/default.nix | 15 ++++++++++++++- pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 303965b34b6..018ef10aebd 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -1,4 +1,11 @@ -{ 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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f923ae0d245..cd2eaffd33a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28614,6 +28614,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 { -- cgit 1.4.1