Unverified Commit 1d852c8b authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #284834 from wegank/btor2tools-gcc-13 

btor2tools: fix build with gcc 13
parents 8d2bca2b b03c6a4e

pkgs/applications/science/logic/btor2tools/default.nix

+9 −1
Original line number Diff line number Diff line 
{ 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 = ''

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -39613,7 +39613,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;