Merge pull request #143793 from CohenCyril/fixHB-coq8.12

coqPackages.hierarchy-builder: etc
This commit is contained in:
Ben Siraphob 2021-10-30 14:01:19 -05:00 committed by GitHub
commit 054bac1eca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,6 @@
{ lib, mkCoqDerivation, which, coq, coq-elpi, version ? null }: { lib, mkCoqDerivation, which, coq, coq-elpi, version ? null }:
with lib; mkCoqDerivation { with lib; let hb = mkCoqDerivation {
pname = "hierarchy-builder"; pname = "hierarchy-builder";
owner = "math-comp"; owner = "math-comp";
inherit version; inherit version;
@ -21,8 +21,6 @@ with lib; mkCoqDerivation {
mlPlugin = true; mlPlugin = true;
buildPhase = "make build";
installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ]; installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ];
extraInstallFlags = [ "VFILES=structures.v" ]; extraInstallFlags = [ "VFILES=structures.v" ];
@ -31,4 +29,8 @@ with lib; mkCoqDerivation {
maintainers = with maintainers; [ cohencyril siraben ]; maintainers = with maintainers; [ cohencyril siraben ];
license = licenses.mit; license = licenses.mit;
}; };
} }; in
hb.overrideAttrs (o:
optionalAttrs (versions.isGe "1.2.0" o.version || o.version == "dev")
{ buildPhase = "make build"; }
)