diff options
| author | markuskowa <markus.kowalewski@gmail.com> | 2022-11-01 11:17:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 11:17:35 +0100 |
| commit | c97de213e21ccbacbec96fed28ecfa65045da9a7 (patch) | |
| tree | f80cf29f34ca5814e422e5915cd4b3b4fc254ec9 /pkgs/development/libraries | |
| parent | f627f3a2b51c77fb227c0ae2b440cfac4a169469 (diff) | |
| parent | 30507f88ad9c7ee5d91c53b954226eb0b11cc6cd (diff) | |
Merge pull request #198852 from wegank/lpcnetfreedv-0.2
freedv: 1.8.3.1 -> 1.8.4
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/codec2/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/lpcnetfreedv/default.nix | 12 |
2 files changed, 20 insertions, 7 deletions
diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 303965b34b637..018ef10aebd53 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/development/libraries/lpcnetfreedv/default.nix b/pkgs/development/libraries/lpcnetfreedv/default.nix index 33b295b9a1ecf..b3b1d7059d81b 100644 --- a/pkgs/development/libraries/lpcnetfreedv/default.nix +++ b/pkgs/development/libraries/lpcnetfreedv/default.nix @@ -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 |