Skip to content

Commit

Permalink
coq: align rocq-core version on overrides
Browse files Browse the repository at this point in the history
  • Loading branch information
proux01 authored and vbgl committed Feb 10, 2025
1 parent 4ed6f0c commit 15fdb27
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkgs/applications/science/logic/coq/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ let
self = stdenv.mkDerivation {
pname = "coq";
inherit (fetched) version src;
exact-version = args.version;

passthru = {
inherit coq-version;
Expand Down Expand Up @@ -233,7 +234,8 @@ self = stdenv.mkDerivation {
}; in
if coqAtLeast "8.21" then self.overrideAttrs(o: {
# coq-core is now a shim for rocq
propagatedBuildInputs = o.propagatedBuildInputs ++ [ rocq-core ];
propagatedBuildInputs = o.propagatedBuildInputs
++ [ (rocq-core.override { version = o.exact-version; }) ];
buildPhase = ''
runHook preBuild
dune build -p coq-core,coqide-server${lib.optionalString buildIde ",rocqide"} -j $NIX_BUILD_CORES
Expand Down

0 comments on commit 15fdb27

Please sign in to comment.