public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocaml-modules: replace buildInputs with nativeBuildInputs where appropriate

Browse Source 
The default has been to use buildInputs for build dependencies.
This doesn't work when cross-compiling.
This commit is contained in:
Yorick van Pelt
2019-10-31 17:16:15 +07:00
committed by Alexander Bantyev
parent 173bf3473c
commit 4550405ac9
22 changed files with 65 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
View File

@@ -7,7 +7,8 @@ stdenv.mkDerivation {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned ];
buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ];
nativeBuildInputs = [ ocaml findlib dune ];
postPatch = "patchShebangs lib/generate_stubs.sh";

4
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
View File

@@ -13,8 +13,10 @@ buildDunePackage rec {
sha256 = "0c537say0f3197zn8d83nrihabrxyn28xc6d7c9c3l0vvrv6qvfj";
};
buildInputs = [ cmdliner cppo ];
nativeBuildInputs = [ ocaml findlib dune cppo ];
buildInputs = [ cmdliner ];
configurePlatforms = [];
propagatedBuildInputs = [ yojson ];
meta = {