Merge pull request #198852 from wegank/lpcnetfreedv-0.2
freedv: 1.8.3.1 -> 1.8.4
This commit is contained in:
commit
c97de213e2
4 changed files with 28 additions and 9 deletions
|
@ -21,13 +21,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "freedv";
|
pname = "freedv";
|
||||||
version = "1.8.3.1";
|
version = "1.8.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "drowe67";
|
owner = "drowe67";
|
||||||
repo = "freedv-gui";
|
repo = "freedv-gui";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-LPCY5gPinxJkfPfumKggI/JQorcW+Qw/ZAP6XQmPkeA=";
|
hash = "sha256-X/jL6q2yLNtRq7Xg9JeXu1zXD0KCs59D1poA9hM3Ndo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||||
|
@ -58,12 +58,15 @@ stdenv.mkDerivation rec {
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DUSE_INTERNAL_CODEC2:BOOL=FALSE"
|
"-DUSE_INTERNAL_CODEC2:BOOL=FALSE"
|
||||||
"-DUSE_STATIC_DEPS:BOOL=FALSE"
|
"-DUSE_STATIC_DEPS:BOOL=FALSE"
|
||||||
|
"-DUNITTEST=ON"
|
||||||
] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ];
|
] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||||
"-DAPPLE_OLD_XCODE"
|
"-DAPPLE_OLD_XCODE"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://freedv.org/";
|
homepage = "https://freedv.org/";
|
||||||
description = "Digital voice for HF radio";
|
description = "Digital voice for HF radio";
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, freedvSupport ? false
|
||||||
|
, lpcnetfreedv
|
||||||
|
, codec2
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "codec2";
|
pname = "codec2";
|
||||||
|
@ -13,6 +20,10 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
|
buildInputs = lib.optionals freedvSupport [
|
||||||
|
lpcnetfreedv
|
||||||
|
];
|
||||||
|
|
||||||
# Install a binary that is used by openwebrx
|
# Install a binary that is used by openwebrx
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
install -Dm0755 src/freedv_rx -t $out/bin/
|
install -Dm0755 src/freedv_rx -t $out/bin/
|
||||||
|
@ -26,6 +37,8 @@ stdenv.mkDerivation rec {
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
# RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/
|
# RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/
|
||||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
|
] ++ lib.optionals freedvSupport [
|
||||||
|
"-DLPCNET=ON"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -4,21 +4,21 @@ let
|
||||||
dataVersion = "191005_v1.0";
|
dataVersion = "191005_v1.0";
|
||||||
data = fetchurl {
|
data = fetchurl {
|
||||||
url = "http://rowetel.com/downloads/deep/lpcnet_${dataVersion}.tgz";
|
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";
|
pname = "lpcnetfreedv";
|
||||||
version = "unstable-2021-06-29";
|
version = "unstable-2022-08-22";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "drowe67";
|
owner = "drowe67";
|
||||||
repo = "LPCNet";
|
repo = "LPCNet";
|
||||||
rev = "0dc5935bbf49ff3ba3c9654cc2f802838ebbaead";
|
rev = "67a6eb74d0c07faddcdce199856862cc45779d25";
|
||||||
sha256 = "0r6488z40fkar11ync8achpg5l6qz7y7cbh7cs3b3w4fsxn58q9i";
|
sha256 = "sha256-eHYZoDgoZBuuLvQn9X7H/zmK5onOAniOgY1/8RVn8gk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ codec2 ];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
mkdir build
|
mkdir build
|
||||||
|
|
|
@ -28644,6 +28644,9 @@ with pkgs;
|
||||||
|
|
||||||
freedv = callPackage ../applications/radio/freedv {
|
freedv = callPackage ../applications/radio/freedv {
|
||||||
inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia;
|
inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia;
|
||||||
|
codec2 = codec2.override {
|
||||||
|
freedvSupport = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
freemind = callPackage ../applications/misc/freemind {
|
freemind = callPackage ../applications/misc/freemind {
|
||||||
|
|
Loading…
Reference in a new issue