diff options
| author | Antonio Nuno Monteiro <anmonteiro@gmail.com> | 2021-11-07 22:10:02 -0800 |
|---|---|---|
| committer | Antonio Nuno Monteiro <anmonteiro@gmail.com> | 2021-11-07 22:10:02 -0800 |
| commit | efd2a1bb8d143bf28162ee775bfe3e35333984d9 (patch) | |
| tree | 70a5e4a6832d9d67f4877bceb7bec1bc92947021 /pkgs/development | |
| parent | 363f590140f3c735f239a204b5c635c7e6edb6ae (diff) | |
| download | nixpkgs-efd2a1bb8d143bf28162ee775bfe3e35333984d9.tar nixpkgs-efd2a1bb8d143bf28162ee775bfe3e35333984d9.tar.gz nixpkgs-efd2a1bb8d143bf28162ee775bfe3e35333984d9.tar.bz2 nixpkgs-efd2a1bb8d143bf28162ee775bfe3e35333984d9.tar.lz nixpkgs-efd2a1bb8d143bf28162ee775bfe3e35333984d9.tar.xz nixpkgs-efd2a1bb8d143bf28162ee775bfe3e35333984d9.tar.zst nixpkgs-efd2a1bb8d143bf28162ee775bfe3e35333984d9.zip | |
ocamlPackages: fix some packages for cross-compilation
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/ocaml-modules/afl-persistent/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/lwt/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ocplib-endian/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
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"; |