Merge pull request #140562 from vbgl/orpie-darwin-fix

orpie: fix build
This commit is contained in:
Ben Siraphob 2021-10-05 05:57:38 +00:00 committed by GitHub
commit 0fced4d919
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions

@ -13,12 +13,10 @@ ocamlPackages.buildDunePackage rec {
sha256 = "1rx2nl6cdv609pfymnbq53pi3ql5fr4kda8x10ycd9xq2gc4f21g";
};
patches = [ ./prefix.patch ];
preConfigure = ''
patchShebangs scripts
substituteInPlace scripts/compute_prefix \
--replace '"topfind"' \
'"${ocamlPackages.findlib}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/topfind"'
export PREFIX=$out
substituteInPlace src/orpie/install.ml.in --replace '@prefix@' $out
'';
buildInputs = with ocamlPackages; [ curses camlp5 num gsl ];

@ -0,0 +1,11 @@
--- a/src/orpie/dune 2021-10-05 06:09:09.040120000 +0200
+++ b/src/orpie/dune 2021-10-05 06:10:06.568418512 +0200
@@ -18,7 +18,7 @@
; Support $PREFIX for overriding installation location
(rule
(targets install.ml)
- (action (run %{project_root}/scripts/compute_prefix subst %{deps} %{targets}))
+ (action (copy# %{deps} %{targets}))
(deps (file install.ml.in)))