From 242090860a2d2f9d665d5b1629402996c12af4b1 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 3 Jul 2022 19:53:06 +0200
Subject: [PATCH 1/3] nixos/openwebrx: add codec2, js8call

---
 nixos/modules/services/web-apps/openwebrx.nix | 2 ++
 pkgs/development/libraries/codec2/default.nix | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/nixos/modules/services/web-apps/openwebrx.nix b/nixos/modules/services/web-apps/openwebrx.nix
index c530a07610f9..751884e5811a 100644
--- a/nixos/modules/services/web-apps/openwebrx.nix
+++ b/nixos/modules/services/web-apps/openwebrx.nix
@@ -20,6 +20,8 @@ in
       path = with pkgs; [
         csdr
         digiham
+        codec2
+        js8call
         alsaUtils
         netcat
       ];
diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix
index 7d271e16f240..b921cb2bbba8 100644
--- a/pkgs/development/libraries/codec2/default.nix
+++ b/pkgs/development/libraries/codec2/default.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  # Install a binary that is used by openwebrx
+  postInstall = ''
+    install -Dm0755 src/freedv_rx $out/bin/
+  '';
+
   # Swap keyword order to satisfy SWIG parser
   postFixup = ''
     sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h

From 10565fccde3cacd75e6ba0ed6ad6496265041f7b Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 3 Jul 2022 20:10:03 +0200
Subject: [PATCH 2/3] m17-cxx-demod: init at 2.3, add to nixos/openwebrx

---
 nixos/modules/services/web-apps/openwebrx.nix |  1 +
 .../radio/m17-cxx-demod/default.nix           | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/radio/m17-cxx-demod/default.nix

diff --git a/nixos/modules/services/web-apps/openwebrx.nix b/nixos/modules/services/web-apps/openwebrx.nix
index 751884e5811a..8a7972a3fc6e 100644
--- a/nixos/modules/services/web-apps/openwebrx.nix
+++ b/nixos/modules/services/web-apps/openwebrx.nix
@@ -22,6 +22,7 @@ in
         digiham
         codec2
         js8call
+        m17-cxx-demod
         alsaUtils
         netcat
       ];
diff --git a/pkgs/applications/radio/m17-cxx-demod/default.nix b/pkgs/applications/radio/m17-cxx-demod/default.nix
new file mode 100644
index 000000000000..86c30686c706
--- /dev/null
+++ b/pkgs/applications/radio/m17-cxx-demod/default.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, codec2 }:
+
+stdenv.mkDerivation rec {
+  pname = "m17-cxx-demod";
+  version = "2.3";
+
+  src = fetchFromGitHub {
+    owner = "mobilinkd";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-mvppkFBmmPVqvlqIqrbwGrOBih5zS5sZrV/usEhHiws=";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ codec2 boost ];
+
+  meta = with lib; {
+    description = "M17 Demodulator in C++";
+    homepage = "https://github.com/mobilinkd/m17-cxx-demod";
+    license = licenses.gpl3Only;
+    platforms = platforms.unix;
+    maintainers = teams.c3d2.members;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3770016107c5..6dc1bd719af0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4979,6 +4979,8 @@ with pkgs;
     inherit (gnome) gnome-common;
   };
 
+  m17-cxx-demod = callPackage ../applications/radio/m17-cxx-demod { };
+
   m17n_db = callPackage ../tools/inputmethods/m17n-db { };
 
   m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };

From 9d51787b536d843926dfd232f806ca0f5b5f5546 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Thu, 7 Jul 2022 01:03:12 +0200
Subject: [PATCH 3/3] codec2: fix build

---
 pkgs/development/libraries/codec2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix
index b921cb2bbba8..e360279c6a44 100644
--- a/pkgs/development/libraries/codec2/default.nix
+++ b/pkgs/development/libraries/codec2/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   # Install a binary that is used by openwebrx
   postInstall = ''
-    install -Dm0755 src/freedv_rx $out/bin/
+    install -Dm0755 src/freedv_rx -t $out/bin/
   '';
 
   # Swap keyword order to satisfy SWIG parser