Merge pull request #182062 from jiegec/hal-hardware-analyzer
hal-hardware-analyzer: fix build with python 3.10
This commit is contained in:
commit
6d626b5e11
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config, python3Packages
|
||||
, boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook
|
||||
, graphviz, llvmPackages, z3
|
||||
}:
|
||||
|
@ -13,6 +13,18 @@ stdenv.mkDerivation rec {
|
|||
rev = "v${version}";
|
||||
sha256 = "sha256-uNpELHhSAVRJL/4iypvnl3nX45SqB419r37lthd2WmQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fix build with python 3.10
|
||||
# https://github.com/emsec/hal/pull/463
|
||||
name = "hal-fix-python-3.10.patch";
|
||||
url = "https://github.com/emsec/hal/commit/f695f55cb2209676ef76366185b7c419417fbbc9.patch";
|
||||
sha256 = "sha256-HsCdG3tPllUsLw6kQtGaaEGkEHqZPSC2v9k6ycO2I/8=";
|
||||
includes = [ "plugins/gui/src/python/python_context.cpp" ];
|
||||
})
|
||||
];
|
||||
|
||||
# make sure bundled dependencies don't get in the way - install also otherwise
|
||||
# copies them in full to the output, bloating the package
|
||||
postPatch = ''
|
||||
|
|
Loading…
Reference in a new issue