diff options
author | Robert Scott <code@humanleg.org.uk> | 2022-08-29 19:41:17 +0100 |
---|---|---|
committer | Robert Scott <code@humanleg.org.uk> | 2022-08-29 19:44:19 +0100 |
commit | 29d9c256267deb6d5b1f8146f85733932834136e (patch) | |
tree | 44b5554d6d4d7396d0c196e639b30f1800e7bd33 /pkgs/applications/science/electronics/hal-hardware-analyzer | |
parent | d251980504f95bec2d7c807b5536363cc91e9d25 (diff) |
hal-hardware-analyzer: use overridden fmt 8.0.1 for spdlog
Diffstat (limited to 'pkgs/applications/science/electronics/hal-hardware-analyzer')
-rw-r--r-- | pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 6b5f04fe7349e..cf073d89be7a4 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -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; |