cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
btor2tools: fix build with gcc 13
This commit is contained in:
Nick Cao 2024-01-30 09:04:32 -05:00 committed by GitHub
commit 1d852c8b67
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/science/logic/btor2tools/default.nix
View file

@ -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 = ''

2
pkgs/top-level/all-packages.nix
View file

@ -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;