From b03c6a4e9a3e3a1573c2957cd7376fffc3642710 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 29 Jan 2024 21:26:07 +0100 Subject: [PATCH] btor2tools: fix build with gcc 13 --- pkgs/applications/science/logic/btor2tools/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix index 0cb9c8037cb2..ce73ea636f29 100644 --- a/pkgs/applications/science/logic/btor2tools/default.nix +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, fetchFromGitHub, fixDarwinDylibNames }: +{ lib, stdenv, cmake, fetchFromGitHub, fetchpatch, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "btor2tools"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0mfqmkgvyw8fa2c09kww107dmk180ch1hp98r5kv41vnc04iqb0s"; }; + patches = [ + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/Boolector/btor2tools/commit/037f1fa88fb439dca6f648ad48a3463256d69d8b.patch"; + hash = "sha256-FX1yy9XdUs1tAReOxhEzNHu48DrISzNNMSYoIrhHoFY="; + }) + ]; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c25c85f04cdf..137c26c9a3ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39644,7 +39644,7 @@ with pkgs; avy = callPackage ../applications/science/logic/avy { }; - btor2tools = pin-to-gcc12-if-gcc13 (callPackage ../applications/science/logic/btor2tools { }); + btor2tools = callPackage ../applications/science/logic/btor2tools { }; boolector = callPackage ../applications/science/logic/boolector { stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_14.stdenv else stdenv;