b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pkgsStatic.ocaml-ng: migrate more logic to derivations

Browse source
This commit is contained in:
Guillaume Girol 2021-08-14 12:00:00 +00:00
parent 6506d2ae4d
commit 41e07ee477
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/tools/ocaml/dune/1.nix
View file

@ -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" ];

2
pkgs/top-level/static.nix
View file

@ -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: