From b3b27cc6b906c48c6c48911dcdfe604f6629e184 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 8 Jan 2025 07:27:23 +0000 Subject: [PATCH 1/2] drat-trim: fix `gcc-14` build Without the change the build on `gcc-14` fails as: drat-trim.c: In function 'read_lit': drat-trim.c:989:10: error: implicit declaration of function 'getc_unlocked' [-Wimplicit-function-declaration] 989 | lc = getc_unlocked (S->proofFile); | ^~~~~~~~~~~~ --- pkgs/by-name/dr/drat-trim/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/dr/drat-trim/package.nix b/pkgs/by-name/dr/drat-trim/package.nix index cb0437860117..c348ae329036 100644 --- a/pkgs/by-name/dr/drat-trim/package.nix +++ b/pkgs/by-name/dr/drat-trim/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, }: stdenv.mkDerivation { @@ -15,6 +16,15 @@ stdenv.mkDerivation { hash = "sha256-sV3A0f1TLSaTIdAtT6y8rU3ZS2UqEePJYSf3UySOlSA="; }; + patches = [ + # gcc-14 build fix: https://github.com/marijnheule/drat-trim/pull/40 + (fetchpatch { + name = "gcc-14-fix.patch"; + url = "https://github.com/marijnheule/drat-trim/commit/8186a7dc083a3951ba87e5ff35d36f1ea2c03f0d.patch"; + hash = "sha256-jgsOYcRYD2VGdOrXW9D8Jh80Nqd+Kp3d2IU+bNK1yGg="; + }) + ]; + postPatch = '' substituteInPlace Makefile --replace gcc cc ''; From bca68f0f56edc59dd4350821e16ee13abe9ed984 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 8 Jan 2025 07:31:37 +0000 Subject: [PATCH 2/2] drat-trim: add install hooks --- pkgs/by-name/dr/drat-trim/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/dr/drat-trim/package.nix b/pkgs/by-name/dr/drat-trim/package.nix index c348ae329036..e51aebd6ea9f 100644 --- a/pkgs/by-name/dr/drat-trim/package.nix +++ b/pkgs/by-name/dr/drat-trim/package.nix @@ -30,7 +30,11 @@ stdenv.mkDerivation { ''; installPhase = '' + runHook preInstall + install -Dt $out/bin drat-trim lrat-check + + runHook postInstall ''; meta = with lib; {