Merge pull request from anmonteiro/anmonteiro/ocaml-cross-fiexs

ocamlPackages: fix some packages for cross-compilation
This commit is contained in:
Guillaume Girol 2021-11-10 22:37:36 +00:00 committed by GitHub
commit 06449fce5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 14 deletions
pkgs/development/ocaml-modules
afl-persistent
lwt
mrmime
ocplib-endian

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i";
};
buildInputs = [ ocaml findlib ];
nativeBuildInputs = [ ocaml findlib ];
# don't run tests in buildPhase
# don't overwrite test binary

View file

@ -17,9 +17,8 @@ buildDunePackage rec {
sha256 = "0cq2qy23sa1a5zk6nja3c652mp29i84yfrkcwks6i8sdqwli36jy";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ cppo dune-configurator ]
++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims
nativeBuildInputs = [ pkg-config cppo dune-configurator ];
buildInputs = optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims
++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
propagatedBuildInputs = [ libev mmap ocplib-endian seq result ];

View file

@ -36,15 +36,6 @@ buildDunePackage rec {
useDune2 = true;
buildInputs = [
afl-persistent
bigarray-compat
bigarray-overlap
bigstringaf
fpath
mirage-crypto-rng
];
propagatedBuildInputs = [
angstrom
base64
@ -59,6 +50,12 @@ buildDunePackage rec {
rresult
unstrctrd
uutf
afl-persistent
bigarray-compat
bigarray-overlap
bigstringaf
fpath
mirage-crypto-rng
];
checkInputs = [

View file

@ -11,7 +11,7 @@ buildDunePackage rec {
useDune2 = true;
buildInputs = [ cppo ];
nativeBuildInputs = [ cppo ];
meta = with lib; {
description = "Optimised functions to read and write int16/32/64";