From cbd45bf5a3ade6c7e03c6a5235942d5e6d467bbf Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 25 Jan 2024 19:24:52 +0000 Subject: [PATCH 1/2] whisper: fix `gcc-13` build failure Without the change build fails on `master` against `gcc-13` as https://hydra.nixos.org/build/246505636: mapper/../common/defs.h:53:9: error: 'uint32_t' does not name a type 53 | typedef uint32_t ref_pos_t; | ^~~~~~~~ mapper/../common/defs.h:35:1: note: 'uint32_t' is defined in header ''; did you forget to '#include '? 34 | #include +++ |+#include --- .../applications/science/biology/whisper/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/whisper/default.nix b/pkgs/applications/science/biology/whisper/default.nix index 4d74ea981098..92df2ed7175c 100644 --- a/pkgs/applications/science/biology/whisper/default.nix +++ b/pkgs/applications/science/biology/whisper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, fetchurl }: stdenv.mkDerivation rec { pname = "whisper"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0wpx1w1mar2d6zq2v14vy6nn896ds1n3zshxhhrrj5d528504iyw"; }; + patches = [ + # gcc-13 compatibility fixes: + # https://github.com/refresh-bio/Whisper/pull/17 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/refresh-bio/Whisper/commit/d67e110dd6899782e4687188f6b432494315b0b4.patch"; + hash = "sha256-Z8GrkUMIKO/ccEdwulQh+WUox3CEckr6NgoBSzYvfuw="; + }) + ]; + preConfigure = '' cd src From 4508debde5ea34cb085fe23c252688495b28e93a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 25 Jan 2024 19:27:12 +0000 Subject: [PATCH 2/2] whisper: enable parallel building --- pkgs/applications/science/biology/whisper/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/biology/whisper/default.nix b/pkgs/applications/science/biology/whisper/default.nix index 92df2ed7175c..4cc211547610 100644 --- a/pkgs/applications/science/biology/whisper/default.nix +++ b/pkgs/applications/science/biology/whisper/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { sed -i 's/ -static / /' makefile ''; + enableParallelBuilding = true; + installPhase = '' runHook preInstall install -Dt $out/bin whisper whisper-index