diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-02-04 09:42:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-04 09:42:55 -0500 |
| commit | b2d58dc9daad81e76f13b1a868ff3e1261884c9d (patch) | |
| tree | 7cdfb864a61e864ed13e9e3ccb2050a2c7cc8dcc /pkgs/applications/science | |
| parent | 8aad1a2ed33b4485aa8a8ce826c62638f3e3a1fd (diff) | |
| parent | ce60e31cbd7561a73d6e0a431c196cc8298a47f6 (diff) | |
| download | nixlib-b2d58dc9daad81e76f13b1a868ff3e1261884c9d.tar nixlib-b2d58dc9daad81e76f13b1a868ff3e1261884c9d.tar.gz nixlib-b2d58dc9daad81e76f13b1a868ff3e1261884c9d.tar.bz2 nixlib-b2d58dc9daad81e76f13b1a868ff3e1261884c9d.tar.lz nixlib-b2d58dc9daad81e76f13b1a868ff3e1261884c9d.tar.xz nixlib-b2d58dc9daad81e76f13b1a868ff3e1261884c9d.tar.zst nixlib-b2d58dc9daad81e76f13b1a868ff3e1261884c9d.zip | |
Merge pull request #286155 from risicle/ris-hal-hardware-analyzer-gcc-13
hal-hardware-analyzer: fix build with gcc 13
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 51e1011b8a2f..13a1ceba3cda 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -73,6 +73,12 @@ in stdenv.mkDerivation rec { url = "https://github.com/emsec/hal/commit/b639a56b303141afbf6731b70b7cc7452551f024.patch"; hash = "sha256-a7AyDEKkqdbiHpa4OHTRuP9Yewb3Nxs/j6bwez5m0yU="; }) + (fetchpatch { + name = "fix-gcc-13-build.patch"; + # https://github.com/emsec/hal/pull/557 + url = "https://github.com/emsec/hal/commit/831b1a7866aa9aabd55ff288c084862dc6a138d8.patch"; + hash = "sha256-kB/sJJtLGl5PUv+mmWVpee/okkJzp5HF0BCiCRCcTKw="; + }) ]; # make sure bundled dependencies don't get in the way - install also otherwise |