From b3a97d4e1fe197b5ce864fe01ea08f886a07f545 Mon Sep 17 00:00:00 2001 From: damhiya Date: Fri, 16 Aug 2024 02:50:19 +0900 Subject: [PATCH] coqPackages.compcert: use external MenhirLib --- pkgs/development/coq-modules/compcert/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 7d78a2d37686..28a08f0039f7 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -1,5 +1,5 @@ { lib, mkCoqDerivation -, coq, flocq +, coq, flocq, MenhirLib , ocamlPackages, fetchpatch, makeWrapper, coq2html , stdenv, tools ? stdenv.cc , version ? null @@ -50,7 +50,7 @@ compcert = mkCoqDerivation { nativeBuildInputs = with ocamlPackages; [ makeWrapper ocaml findlib menhir coq coq2html ]; buildInputs = with ocamlPackages; [ menhirLib ]; - propagatedBuildInputs = [ flocq ]; + propagatedBuildInputs = [ flocq MenhirLib ]; enableParallelBuilding = true; @@ -66,6 +66,7 @@ compcert = mkCoqDerivation { -coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \ -toolprefix ${tools}/bin/ \ -use-external-Flocq \ + -use-external-MenhirLib \ ${target} \ ''; # don't remove the \ above, the command gets appended in override below