Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ghdl: use gnat11 to unbreak build #184352

Merged
merged 3 commits into from Aug 3, 2022
Merged

ghdl: use gnat11 to unbreak build #184352

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11f01bf
ghdl: use gnat11 to unbreak build
Jul 31, 2022
39c2c98
Update pkgs/development/compilers/ghdl/default.nix
Aug 2, 2022
b2094cc
fix the breakage
Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/compilers/ghdl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, callPackage, gnat, zlib, llvm, lib
{ stdenv, fetchFromGitHub, fetchpatch, callPackage, gnat11, zlib, llvm, lib
, backend ? "mcode" }:

assert backend == "mcode" || backend == "llvm";
Expand All @@ -25,7 +25,7 @@ stdenv.mkDerivation rec {

LIBRARY_PATH = "${stdenv.cc.libc}/lib";

buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ];
buildInputs = [ gnat11 zlib ] ++ lib.optional (backend == "llvm") [ llvm ];
propagatedBuildInputs = lib.optionals (backend == "llvm") [ zlib ];

preConfigure = ''
Expand Down