nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-06-05 21:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ocamlPackages.buildDunePackage: Use final pname and version"

Browse Source
This commit is contained in:
Vincent Laporte
2025-12-20 12:29:57 +01:00
committed by GitHub
parent aa1d90834b
commit 85c59938d8
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/build-support/ocaml/dune.nix
View File

@@ -37,10 +37,10 @@ lib.extendMkDerivation {
in
if args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion then
throw "${finalAttrs.pname}-${finalAttrs.version} is not available for OCaml ${ocaml.version}"
throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
else
{
name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}";
name = "ocaml${ocaml.version}-${pname}-${version}";
strictDeps = true;
@@ -58,14 +58,14 @@ lib.extendMkDerivation {
buildPhase =
args.buildPhase or ''
runHook preBuild
dune build -p ${finalAttrs.pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
dune build -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
runHook postBuild
'';
installPhase =
args.installPhase or ''
runHook preInstall
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${finalAttrs.pname} \
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} \
${
if lib.versionAtLeast Dune.version "2.9" then
"--docdir $out/share/doc --mandir $out/share/man"
@@ -78,15 +78,11 @@ lib.extendMkDerivation {
checkPhase =
args.checkPhase or ''
runHook preCheck
dune runtest -p ${finalAttrs.pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
dune runtest -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
runHook postCheck
'';
meta = (args.meta or { }) // {
# TODO: ocaml.meta.platforms is where the compiler can run
# Package's meta.platforms are where the compiler can target.
#
# See: rustc.targetPlatforms
platforms = args.meta.platforms or ocaml.meta.platforms;
};
};