diff options
| author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2021-08-14 12:00:00 +0000 |
|---|---|---|
| committer | Guillaume Girol <symphorien+git@xlumurb.eu> | 2021-08-19 09:30:48 +0200 |
| commit | 41e07ee477012daa36857027695a377046ba3369 (patch) | |
| tree | 32c3e83f2dc1c1c65d154e88970a4ed203300687 | |
| parent | 6506d2ae4ddc7370c118f124f24d2db9932b8ce2 (diff) | |
| download | nixpkgs-41e07ee477012daa36857027695a377046ba3369.tar nixpkgs-41e07ee477012daa36857027695a377046ba3369.tar.gz nixpkgs-41e07ee477012daa36857027695a377046ba3369.tar.bz2 nixpkgs-41e07ee477012daa36857027695a377046ba3369.tar.lz nixpkgs-41e07ee477012daa36857027695a377046ba3369.tar.xz nixpkgs-41e07ee477012daa36857027695a377046ba3369.tar.zst nixpkgs-41e07ee477012daa36857027695a377046ba3369.zip | |
pkgsStatic.ocaml-ng: migrate more logic to derivations
| -rw-r--r-- | pkgs/development/tools/ocaml/dune/1.nix | 3 | ||||
| -rw-r--r-- | 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: |