From 76792578741f30411be306105879bcddb0f9db33 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Thu, 16 Jan 2025 13:16:21 +0100 Subject: [PATCH] coqPackages.stdlib: keep compiling with master --- pkgs/development/coq-modules/stdlib/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/coq-modules/stdlib/default.nix b/pkgs/development/coq-modules/stdlib/default.nix index e75d62a0ce34..a443daef68f1 100644 --- a/pkgs/development/coq-modules/stdlib/default.nix +++ b/pkgs/development/coq-modules/stdlib/default.nix @@ -7,7 +7,7 @@ (mkCoqDerivation { pname = "stdlib"; - repo = "coq"; + repo = "stdlib"; owner = "coq"; opam-name = "coq-stdlib"; @@ -30,16 +30,15 @@ useDune = true; configurePhase = '' - patchShebangs stdlib/dev/with-rocq-wrap.sh - ''; # don't run Coq's configure + patchShebangs dev/with-rocq-wrap.sh + ''; buildPhase = '' - cd stdlib - dev/with-rocq-wrap.sh dune build -p coq-stdlib @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} + dev/with-rocq-wrap.sh dune build -p rocq-stdlib,coq-stdlib @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} ''; installPhase = '' - dev/with-rocq-wrap.sh dune install --root . coq-stdlib --prefix=$out --libdir $OCAMLFIND_DESTDIR + dev/with-rocq-wrap.sh dune install --root . rocq-stdlib coq-stdlib --prefix=$out --libdir $OCAMLFIND_DESTDIR mkdir $out/lib/coq/ mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version} '';