diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-01-24 13:14:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-24 13:14:53 +0100 |
| commit | 95b3d7bd25adb7f4adbdb0356d975cb356d44f24 (patch) | |
| tree | 0347cd74284e5c7b6d372005488182c71d27dadb /pkgs/applications/radio | |
| parent | d63af7f57c966ce08eaded990d575957d4fb9144 (diff) | |
| parent | d7b970c4ee9da0c7288560c4901391587c51606e (diff) | |
| download | nixlib-95b3d7bd25adb7f4adbdb0356d975cb356d44f24.tar nixlib-95b3d7bd25adb7f4adbdb0356d975cb356d44f24.tar.gz nixlib-95b3d7bd25adb7f4adbdb0356d975cb356d44f24.tar.bz2 nixlib-95b3d7bd25adb7f4adbdb0356d975cb356d44f24.tar.lz nixlib-95b3d7bd25adb7f4adbdb0356d975cb356d44f24.tar.xz nixlib-95b3d7bd25adb7f4adbdb0356d975cb356d44f24.tar.zst nixlib-95b3d7bd25adb7f4adbdb0356d975cb356d44f24.zip | |
Merge pull request #283474 from trofi/m17-cxx-demod-gcc-13-fix
Diffstat (limited to 'pkgs/applications/radio')
| -rw-r--r-- | pkgs/applications/radio/m17-cxx-demod/default.nix | 12 |
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 ]; |