about summary refs log tree commit diff
path: root/pkgs/applications/radio
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2024-01-24 10:55:15 +0000
committerSergei Trofimovich <slyich@gmail.com>2024-01-24 10:55:15 +0000
commitd7b970c4ee9da0c7288560c4901391587c51606e (patch)
tree8fda977697c1ea7a12db333114e556cf2025c0bd /pkgs/applications/radio
parent19f815760d1785594aa5009043c7708caebffdb9 (diff)
downloadnixlib-d7b970c4ee9da0c7288560c4901391587c51606e.tar
nixlib-d7b970c4ee9da0c7288560c4901391587c51606e.tar.gz
nixlib-d7b970c4ee9da0c7288560c4901391587c51606e.tar.bz2
nixlib-d7b970c4ee9da0c7288560c4901391587c51606e.tar.lz
nixlib-d7b970c4ee9da0c7288560c4901391587c51606e.tar.xz
nixlib-d7b970c4ee9da0c7288560c4901391587c51606e.tar.zst
nixlib-d7b970c4ee9da0c7288560c4901391587c51606e.zip
m17-cxx-demod: fix the build against `gcc-13`
Without the change build fails against `gcc-13` on `master` as
https://hydra.nixos.org/build/246569430:

    In file included from /build/source/apps/m17-mod.cpp:3:
    /build/source/include/m17cxx/Util.h:213:47: error: 'uint8_t' was not declared in this scope
      213 | constexpr bool get_bit_index(const std::array<uint8_t, N>& input, size_t index)
          |                                               ^~~~~~~
    /build/source/include/m17cxx/Util.h:12:1: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
       11 | #include <limits>
      +++ |+#include <cstdint>
       12 |
Diffstat (limited to 'pkgs/applications/radio')
-rw-r--r--pkgs/applications/radio/m17-cxx-demod/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/radio/m17-cxx-demod/default.nix b/pkgs/applications/radio/m17-cxx-demod/default.nix
index 884ebe7a91b5..d6663fbc4287 100644
--- a/pkgs/applications/radio/m17-cxx-demod/default.nix
+++ b/pkgs/applications/radio/m17-cxx-demod/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, codec2 }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, boost, codec2 }:
 
 stdenv.mkDerivation rec {
   pname = "m17-cxx-demod";
@@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-mvppkFBmmPVqvlqIqrbwGrOBih5zS5sZrV/usEhHiws=";
   };
 
+  patches = [
+    # Pull fix pending upstream inclusion for `gcc-13` support:
+    #   https://github.com/mobilinkd/m17-cxx-demod/pull/34
+    (fetchpatch {
+      name = "gcc-13.patch";
+      url = "https://github.com/mobilinkd/m17-cxx-demod/commit/2e2aaf95eeac456a2e8795e4363518bb4d797ac0.patch";
+      hash = "sha256-+XRzHStJ/7XI5JDoBeNwbifsTOw8il3GyFwlbw07wyk=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ codec2 boost ];