From 41e07ee477012daa36857027695a377046ba3369 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sat, 14 Aug 2021 12:00:00 +0000
Subject: pkgsStatic.ocaml-ng: migrate more logic to derivations

---
 pkgs/development/tools/ocaml/dune/1.nix | 3 ++-
 pkgs/top-level/static.nix               | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ocaml/dune/1.nix b/pkgs/development/tools/ocaml/dune/1.nix
index 1c74980eb95..79707a3c009 100644
--- a/pkgs/development/tools/ocaml/dune/1.nix
+++ b/pkgs/development/tools/ocaml/dune/1.nix
@@ -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" ];
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index 39923b0f59a..2ca24175cfa 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -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:
-- 
cgit 1.4.1