hal-hardware-analyzer: use overridden fmt 8.0.1 for spdlog
This commit is contained in:
parent
d251980504
commit
29d9c25626
@ -1,9 +1,39 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config, python3Packages
|
||||
, boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook
|
||||
, graphviz, llvmPackages, z3
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3Packages
|
||||
, boost
|
||||
, rapidjson
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, igraph
|
||||
, spdlog
|
||||
, wrapQtAppsHook
|
||||
, graphviz
|
||||
, llvmPackages
|
||||
, z3
|
||||
, fmt_8
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
# no stable hal release yet with recent spdlog/fmt support, remove
|
||||
# once 4.0.0 is released - see https://github.com/emsec/hal/issues/452
|
||||
spdlog' = spdlog.override {
|
||||
fmt_8 = fmt_8.overrideAttrs (_: rec {
|
||||
version = "8.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fmtlib";
|
||||
repo = "fmt";
|
||||
rev = version;
|
||||
sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw";
|
||||
};
|
||||
});
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "3.3.0";
|
||||
pname = "hal-hardware-analyzer";
|
||||
|
||||
@ -34,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog graphviz wrapQtAppsHook z3 ]
|
||||
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog' graphviz wrapQtAppsHook z3 ]
|
||||
++ (with python3Packages; [ python pybind11 ])
|
||||
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user