diff options
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/electronics/nvc/default.nix | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index cff9809b03065..5ec866ea9c490 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , check , flex @@ -15,15 +16,28 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "nickg"; repo = pname; rev = "r${version}"; - hash = "sha256-s7QgufD3sQ6sZh2H78E8x0dMidHRKHUm8tASXoKK3xk="; + hash = "sha256-hsoEAFSXI2bvzZV33jdg1849fipPQlUu3MZVvht54fI="; }; + patches = [ + # TODO: remove me on next release + (fetchpatch { + url = "https://github.com/nickg/nvc/commit/c857e16c33851f8a5386b97bc0dada2836b5db83.patch"; + hash = "sha256-rvZHI1iQXT9zLpCugg5mGmMZBRbTe9PSHtDG7FVZ67Q="; + }) + ]; + + # TODO: recheck me on next release + postPatch = lib.optionalString stdenv.isLinux '' + sed -i "/vhpi4/d" test/regress/testlist.txt + ''; + nativeBuildInputs = [ autoreconfHook check @@ -36,15 +50,12 @@ stdenv.mkDerivation rec { libffi llvm zlib - ] ++ [ - (if stdenv.isLinux then elfutils else libelf) + ] ++ lib.optionals stdenv.isLinux [ + elfutils + ] ++ lib.optionals (!stdenv.isLinux) [ + libelf ]; - # TODO: recheck me on next release - postPatch = lib.optionalString stdenv.isLinux '' - sed -i "/vhpi4/d" test/regress/testlist.txt - ''; - preConfigure = '' mkdir build cd build @@ -63,7 +74,7 @@ stdenv.mkDerivation rec { description = "VHDL compiler and simulator"; homepage = "https://www.nickg.me.uk/nvc/"; license = licenses.gpl3Plus; - platforms = platforms.unix; maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; }; } |