ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues 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
No known key found for this signature in database
GPG Key ID: E081FF12ADCB4AD5
22 changed files with 65 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/ocaml-modules/alcotest/default.nix
View File

@ -6,14 +6,15 @@ let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then { if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
version = "0.8.5"; version = "0.8.5";
sha256 = "1mhckvdcxkikbzgvy24kjz4265l15b86a6swz7m3ynbgvqdcfzqn"; sha256 = "1mhckvdcxkikbzgvy24kjz4265l15b86a6swz7m3ynbgvqdcfzqn";
buildInputs = [ dune ]; nativeBuildInputs = [ dune ];
propagatedBuildInputs = [ uuidm ]; propagatedBuildInputs = [ uuidm ];
buildPhase = "dune build -p alcotest"; buildPhase = "dune build -p alcotest";
inherit (dune) installPhase; inherit (dune) installPhase;
} else { } else {
version = "0.7.2"; version = "0.7.2";
sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md";
buildInputs = [ ocamlbuild topkg ]; buildInputs = [ topkg ];
nativeBuildInputs = [ ocamlbuild ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;
}; };
in in
@ -27,7 +28,8 @@ stdenv.mkDerivation rec {
inherit (param) sha256; inherit (param) sha256;
}; };
buildInputs = [ ocaml findlib ] ++ param.buildInputs; nativeBuildInputs = [ ocaml findlib ] ++ (param.nativeBuildInputs or []);
buildInputs = [ findlib ] ++ (param.buildInputs or []);
propagatedBuildInputs = [ cmdliner astring fmt result ] propagatedBuildInputs = [ cmdliner astring fmt result ]
++ (param.propagatedBuildInputs or []); ++ (param.propagatedBuildInputs or []);

3
pkgs/development/ocaml-modules/asn1-combinators/default.nix
View File

@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
inherit (param) sha256; inherit (param) sha256;
}; };
buildInputs = [ ocaml findlib ocamlbuild ounit topkg ]; buildInputs = [ findlib ounit topkg ];
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs; propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs;
buildPhase = "${topkg.run} build --tests true"; buildPhase = "${topkg.run} build --tests true";

3
pkgs/development/ocaml-modules/bos/default.nix
View File

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc"; sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
}; };
buildInputs = [ ocaml findlib ocamlbuild topkg ]; nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ findlib topkg ];
propagatedBuildInputs = [ astring fmt fpath logs rresult ]; propagatedBuildInputs = [ astring fmt fpath logs rresult ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

4
pkgs/development/ocaml-modules/cmdliner/default.nix
View File

@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
inherit (param) sha256; inherit (param) sha256;
}; };
nativeBuildInputs = [ ocamlbuild topkg ]; nativeBuildInputs = [ ocaml ocamlbuild findlib ];
buildInputs = [ ocaml findlib ]; buildInputs = [ topkg ];
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

3
pkgs/development/ocaml-modules/fmt/default.nix
View File

@ -8,7 +8,8 @@ stdenv.mkDerivation {
sha256 = "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060"; sha256 = "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060";
}; };
buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ findlib topkg cmdliner ];
propagatedBuildInputs = [ result uchar ]; propagatedBuildInputs = [ result uchar ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

3
pkgs/development/ocaml-modules/jsonm/default.nix
View File

@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w"; sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w";
}; };
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ findlib topkg ];
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ uutf ]; propagatedBuildInputs = [ uutf ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

3
pkgs/development/ocaml-modules/logs/default.nix
View File

@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
sha256 = "1lkhr7i44xw4kpfbhgj3rbqy3dv5bfm4kyrbl8a9rfafddcxlwss"; sha256 = "1lkhr7i44xw4kpfbhgj3rbqy3dv5bfm4kyrbl8a9rfafddcxlwss";
}; };
buildInputs = [ ocaml findlib ocamlbuild topkg fmt cmdliner lwt ]; nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ findlib topkg fmt cmdliner lwt ];
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];
buildPhase = "${topkg.run} build --with-js_of_ocaml false"; buildPhase = "${topkg.run} build --with-js_of_ocaml false";

4
pkgs/development/ocaml-modules/magic-mime/default.nix
View File

@ -11,7 +11,9 @@ stdenv.mkDerivation {
sha256 = "058d83hmxd5mjccxdm3ydchmhk2lca5jdg82jg0klsigmf4ida6v"; sha256 = "058d83hmxd5mjccxdm3ydchmhk2lca5jdg82jg0klsigmf4ida6v";
}; };
buildInputs = [ ocaml findlib ocamlbuild ]; nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ findlib ];
configurePlatforms = [];
createFindlibDestdir = true; createFindlibDestdir = true;

3
pkgs/development/ocaml-modules/mtime/default.nix
View File

@ -23,7 +23,8 @@ stdenv.mkDerivation {
inherit (param) sha256; inherit (param) sha256;
}; };
buildInputs = [ ocaml findlib ocamlbuild topkg ] nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ findlib topkg ]
++ stdenv.lib.optional jsooSupport js_of_ocaml; ++ stdenv.lib.optional jsooSupport js_of_ocaml;
buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}"; buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}";

17
pkgs/development/ocaml-modules/nocrypto/default.nix
View File

@ -1,11 +1,19 @@
{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg { stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg
, cpuid, ocb-stubblr, sexplib , cpuid, ocb-stubblr, sexplib
, cstruct, zarith, ppx_sexp_conv, ppx_deriving , cstruct, zarith, ppx_sexp_conv, writeScriptBin
, cstruct-lwt ? null , cstruct-lwt ? null
}: }:
with stdenv.lib; with stdenv.lib;
let withLwt = cstruct-lwt != null; in let
withLwt = cstruct-lwt != null;
# the build system will call 'cc' with no way to override
# this is wrong when we're cross-compiling, so insert a wrapper
cc-wrapper = writeScriptBin "cc" ''
set -e
$CC "$@"
'';
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-nocrypto-${version}"; name = "ocaml${ocaml.version}-nocrypto-${version}";
@ -43,8 +51,9 @@ stdenv.mkDerivation rec {
}) })
]; ];
buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ]; nativeBuildInputs = [ ocaml findlib ocamlbuild cc-wrapper ];
propagatedBuildInputs = [ cstruct ppx_deriving ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; buildInputs = [ ocamlbuild findlib topkg cpuid ocb-stubblr ];
propagatedBuildInputs = [ cstruct ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt;
buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}"; buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}";
inherit (topkg) installPhase; inherit (topkg) installPhase;

3
pkgs/development/ocaml-modules/num/default.nix
View File

@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
}) })
]; ];
buildInputs = [ ocaml findlib ]; nativeBuildInputs = [ ocaml findlib ];
buildInputs = [ findlib ];
createFindlibDestdir = true; createFindlibDestdir = true;

4
pkgs/development/ocaml-modules/ounit/default.nix
View File

@ -14,7 +14,9 @@ stdenv.mkDerivation {
sha256 = "0hbd2sqdz75lv5ax82yhsfdk1dlcvq12xpys6n85ysmrl0c3d3lk"; sha256 = "0hbd2sqdz75lv5ax82yhsfdk1dlcvq12xpys6n85ysmrl0c3d3lk";
}); });
buildInputs = [ ocaml findlib ocamlbuild ]; nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ findlib ];
configurePlatforms = [];
dontAddPrefix = true; dontAddPrefix = true;

3
pkgs/development/ocaml-modules/ppx_tools/default.nix
View File

@ -37,7 +37,8 @@ in
inherit (param) sha256; inherit (param) sha256;
}; };
buildInputs = [ ocaml findlib ]; nativeBuildInputs = [ ocaml findlib ];
buildInputs = [ findlib ];
createFindlibDestdir = true; createFindlibDestdir = true;

3
pkgs/development/ocaml-modules/ptime/default.nix
View File

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1fxq57xy1ajzfdnvv5zfm7ap2nf49znw5f9gbi4kb9vds942ij27"; sha256 = "1fxq57xy1ajzfdnvv5zfm7ap2nf49znw5f9gbi4kb9vds942ij27";
}; };
buildInputs = [ ocaml findlib ocamlbuild topkg js_of_ocaml ]; nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ findlib topkg js_of_ocaml ];
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];

3
pkgs/development/ocaml-modules/tls/default.nix
View File

@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g"; sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g";
}; };
buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_cstruct ] nativeBuildInputs = [ ocaml ocamlbuild findlib ];
buildInputs = [ findlib topkg ppx_sexp_conv ppx_cstruct ]
++ optionals doCheck [ ounit cstruct-unix ]; ++ optionals doCheck [ ounit cstruct-unix ];
propagatedBuildInputs = [ cstruct-sexp nocrypto result x509 ] ++ propagatedBuildInputs = [ cstruct-sexp nocrypto result x509 ] ++
optional withLwt lwt; optional withLwt lwt;

2
pkgs/development/ocaml-modules/topkg/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
sha256 = "1df61vw6v5bg2mys045682ggv058yqkqb67w7r2gz85crs04d5fw"; sha256 = "1df61vw6v5bg2mys045682ggv058yqkqb67w7r2gz85crs04d5fw";
}; };
buildInputs = [ ocaml findlib ocamlbuild ]; nativeBuildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];
buildPhase = "${run} build"; buildPhase = "${run} build";

4
pkgs/development/ocaml-modules/uchar/default.nix
View File

@ -8,9 +8,11 @@ stdenv.mkDerivation {
sha256 = "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7"; sha256 = "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7";
}; };
buildInputs = [ ocaml ocamlbuild findlib opaline ]; nativeBuildInputs = [ ocaml ocamlbuild findlib opaline ];
buildInputs = [ findlib ];
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; installPhase = "opaline -libdir $OCAMLFIND_DESTDIR";
configurePlatforms = [];
meta = { meta = {
description = "Compatibility library for OCaml’s Uchar module"; description = "Compatibility library for OCaml’s Uchar module";

4
pkgs/development/ocaml-modules/uuidm/default.nix
View File

@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8"; sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8";
}; };
buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; nativeBuildInputs = [ ocaml findlib ocamlbuild ];
configurePlatforms = [];
buildInputs = [ topkg cmdliner ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

3
pkgs/development/ocaml-modules/uutf/default.nix
View File

@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1nx1rly3qj23jzn9yk3x6fwqimcxjd84kv5859vvhdg56psq26p6"; sha256 = "1nx1rly3qj23jzn9yk3x6fwqimcxjd84kv5859vvhdg56psq26p6";
}; };
buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; nativeBuildInputs = [ ocaml ocamlbuild findlib ];
buildInputs = [ findlib topkg cmdliner ];
propagatedBuildInputs = [ uchar ]; propagatedBuildInputs = [ uchar ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

9
pkgs/development/ocaml-modules/yojson/default.nix
View File

@ -6,7 +6,7 @@ let
version = "1.7.0"; version = "1.7.0";
url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd"; sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd";
buildInputs = [ dune ]; nativeBuildInputs = [ dune ];
extra = { inherit (dune) installPhase; }; extra = { inherit (dune) installPhase; };
} else rec { } else rec {
version = "1.2.3"; version = "1.2.3";
@ -29,9 +29,10 @@ stdenv.mkDerivation ({
inherit (param) url sha256; inherit (param) url sha256;
}; };
buildInputs = [ ocaml findlib ] ++ (param.buildInputs or []); nativeBuildInputs = [ ocaml findlib ] ++ (param.nativeBuildInputs or []);
propagatedNativeBuildInputs = [ cppo ];
propagatedBuildInputs = [ cppo easy-format biniou ]; propagatedBuildInputs = [ easy-format biniou ];
configurePlatforms = [];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An optimized parsing and printing library for the JSON format"; description = "An optimized parsing and printing library for the JSON format";

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; 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"; 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"; sha256 = "0c537say0f3197zn8d83nrihabrxyn28xc6d7c9c3l0vvrv6qvfj";
}; };
buildInputs = [ cmdliner cppo ]; nativeBuildInputs = [ ocaml findlib dune cppo ];
buildInputs = [ cmdliner ];
configurePlatforms = [];
propagatedBuildInputs = [ yojson ]; propagatedBuildInputs = [ yojson ];
meta = { meta = {