diff options
author | sternenseemann <sternenseemann@systemli.org> | 2021-11-01 12:55:18 +0100 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2021-11-15 22:41:56 +0100 |
commit | debf4fc929cc937562b06607c1a3d81f92ee3a77 (patch) | |
tree | dbb67ff5e5e961596853899641b7b420b3f6e61f /pkgs/development/compilers/ghdl | |
parent | 7adb11cf580fc75faa864a640f1204e7fb874463 (diff) |
gnat: 9 -> 11
Update the default GNAT version from 9 to 11, as GNAT >= 11 is required to compile the 22.* AdaCore libraries. To allow this, we need to pick a patch from ghdl's master fixing a compilation problem with GNAT 11.
Diffstat (limited to 'pkgs/development/compilers/ghdl')
-rw-r--r-- | pkgs/development/compilers/ghdl/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index e7886eb8f5ed9..266ee97a2e90a 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, gnat, zlib, llvm, lib +{ stdenv, fetchFromGitHub, fetchpatch, callPackage, gnat, zlib, llvm, lib , backend ? "mcode" }: assert backend == "mcode" || backend == "llvm"; @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { sha256 = "1gyh0xckwbzgslbpw9yrpj4gqs9fm1a2qpbzl0sh143fk1kwjlly"; }; + patches = [ + # Allow compilation with GNAT 11, picked from master + (fetchpatch { + name = "fix-gnat-11-compilation.patch"; + url = "https://github.com/ghdl/ghdl/commit/8356ea3bb4e8d0e5ad8638c3d50914b64fc360ec.patch"; + sha256 = "04pzn8g7xha8000wbjjmry6h1grfqyn3bjvj47hi4qwgl21wfjra"; + }) + ]; + LIBRARY_PATH = "${stdenv.cc.libc}/lib"; buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ]; |