pkgsStatic.ocaml-ng: migrate more logic to derivations
This commit is contained in:
parent
6506d2ae4d
commit
41e07ee477
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, ocaml, findlib }:
|
||||
{ stdenv, lib, fetchurl, ocaml, findlib, ncurses }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
|| lib.versionAtLeast ocaml.version "4.12"
|
||||
|
@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ];
|
||||
buildInputs = [ ncurses ];
|
||||
strictDeps = true;
|
||||
|
||||
buildFlags = [ "release" ];
|
||||
|
|
|
@ -51,8 +51,6 @@ self: super: let
|
|||
b.overrideAttrs (o: {
|
||||
configurePlatforms = [ ];
|
||||
dontAddStaticConfigureFlags = true;
|
||||
buildInputs = (o.buildInputs or [ ]) ++ o.nativeBuildInputs or [ ];
|
||||
propagatedNativeBuildInputs = o.propagatedBuildInputs or [ ];
|
||||
});
|
||||
|
||||
ocamlStaticAdapter = _: super:
|
||||
|
|
Loading…
Reference in a new issue