From efd2a1bb8d143bf28162ee775bfe3e35333984d9 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 7 Nov 2021 22:10:02 -0800 Subject: ocamlPackages: fix some packages for cross-compilation --- pkgs/development/ocaml-modules/afl-persistent/default.nix | 2 +- pkgs/development/ocaml-modules/lwt/default.nix | 4 ++-- pkgs/development/ocaml-modules/ocplib-endian/default.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/ocaml-modules/afl-persistent/default.nix b/pkgs/development/ocaml-modules/afl-persistent/default.nix index 5625cd95764..ba266ade830 100644 --- a/pkgs/development/ocaml-modules/afl-persistent/default.nix +++ b/pkgs/development/ocaml-modules/afl-persistent/default.nix @@ -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 diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 7d6424564d2..4798cfe69c2 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -17,8 +17,8 @@ buildDunePackage rec { sha256 = "0cq2qy23sa1a5zk6nja3c652mp29i84yfrkcwks6i8sdqwli36jy"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cppo dune-configurator ] + 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 ]; diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 2cb066a7c03..f2cf4acbf27 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -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"; -- cgit 1.4.1