3
0
Fork 0
forked from mirrors/nixpkgs

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 |
This commit is contained in:
Sergei Trofimovich 2024-01-24 10:55:15 +00:00
parent 19f815760d
commit d7b970c4ee

View file

@ -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 ];