diff options
| author | Ulrik Strid <ulrik.strid@outlook.com> | 2022-02-22 10:59:04 +0100 |
|---|---|---|
| committer | Ulrik Strid <ulrik.strid@outlook.com> | 2022-02-24 14:39:27 +0100 |
| commit | a13cdfe520d87db401dd000fbd67cad728162a60 (patch) | |
| tree | 85c0d28a4d9ae9e447f2bbf026decdb0ff35d946 /pkgs/development/ocaml-modules/type_conv | |
| parent | 24102db995db84d1caa4cf24371b153c2023aeee (diff) | |
| download | nixpkgs-a13cdfe520d87db401dd000fbd67cad728162a60.tar nixpkgs-a13cdfe520d87db401dd000fbd67cad728162a60.tar.gz nixpkgs-a13cdfe520d87db401dd000fbd67cad728162a60.tar.bz2 nixpkgs-a13cdfe520d87db401dd000fbd67cad728162a60.tar.lz nixpkgs-a13cdfe520d87db401dd000fbd67cad728162a60.tar.xz nixpkgs-a13cdfe520d87db401dd000fbd67cad728162a60.tar.zst nixpkgs-a13cdfe520d87db401dd000fbd67cad728162a60.zip | |
ocamlPackages tree-wide: Move buildInputs that should be nativeBuildInputs
To keep this for the future we also strictDeps where possible, including for janePackages, topkg, oasis and ocamlbuild. This makes some closures significantly smaller and makes cross compilation easier
Diffstat (limited to 'pkgs/development/ocaml-modules/type_conv')
| -rw-r--r-- | pkgs/development/ocaml-modules/type_conv/108.08.00.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/type_conv/109.60.01.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/type_conv/112.01.01.nix | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index 337874e11a9..fb3977223f7 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index 4ec160a9223..1f6500c6ed1 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-8Oz/fPL3+RghyxQp5u6seSEdf0BgfP6XNcsMYty0rNs="; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index e90ca2d16a6..468b872ec3d 100644 --- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildOcaml}: +{ lib, fetchFromGitHub, buildOcaml, camlp4}: buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; @@ -13,6 +13,10 @@ buildOcaml rec { sha256 = "sha256-HzH0hnceCQ2kDRATjl+tfKk3XSBDsGnPzVUGYpDQUmU="; }; + strictDeps = true; + + buildInputs = [ camlp4 ]; + meta = { homepage = "https://github.com/janestreet/type_conv/"; description = "Support library for preprocessor type conversions"; |