diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2024-02-10 23:32:16 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2024-02-10 23:32:16 +0000 |
| commit | ea3da05805c4a2b56510e9f22a0c29f1c0a5f0e9 (patch) | |
| tree | 76b78cef1fa550e953b2f57180624f7a7bc301ce | |
| parent | Merge pull request #287761 from jtojnar/python313-installer-fix (diff) | |
| download | nixpkgs-ea3da05805c4a2b56510e9f22a0c29f1c0a5f0e9.tar.gz | |
sptk: fix `gcc-13` build failure
Without the change build fails on` master` as
https://hydra.nixos.org/build/247569562:
/build/source/src/conversion/autocorrelation_to_composite_sinusoidal_modeling.cc:25:1: error: 'uint64_t' does not name a type
25 | uint64_t CalculateBinomialCoefficient(int n, int k) {
| ^~~~~~~~
/build/source/src/conversion/autocorrelation_to_composite_sinusoidal_modeling.cc:21:1: note: 'uint64_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
20 | #include <cmath> // std::acos, std::fabs, std::pow
+++ |+#include <cstdint>
21 | #include <cstddef> // std::size_t
| -rw-r--r-- | pkgs/development/libraries/sptk/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/libraries/sptk/default.nix b/pkgs/development/libraries/sptk/default.nix index 3ad693ae5368..07b9bf3eb3c9 100644 --- a/pkgs/development/libraries/sptk/default.nix +++ b/pkgs/development/libraries/sptk/default.nix @@ -2,6 +2,7 @@ , stdenv , cmake , fetchFromGitHub +, fetchpatch }: stdenv.mkDerivation rec { @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { hash = "sha256-lIyOcN2AR3ilUZ9stpicjbwlredbwgGPwmMICxZEijU="; }; + patches = [ + # Fix gcc-13 build failure: + # https://github.com/sp-nitech/SPTK/pull/57 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/sp-nitech/SPTK/commit/060bc2ad7a753c1f9f9114a70d4c4337b91cb7e0.patch"; + hash = "sha256-QfzpIS63LZyTHAaMGUZh974XLRNZLQG3om7ZJJ4RlgE="; + }) + ]; + nativeBuildInputs = [ cmake ]; |