diff --git a/flake.nix b/flake.nix index be3c15505d8..09181bf792d 100644 --- a/flake.nix +++ b/flake.nix @@ -48,17 +48,9 @@ }) self.overlays.default ]; - dune-static-overlay = self: super: { - ocamlPackages = super.ocaml-ng.ocamlPackages_5_1.overrideScope (oself: osuper: { - dune_3 = osuper.dune_3.overrideAttrs (a: { - src = ./.; - preBuild = "ocaml boot/bootstrap.ml --static"; - }); - }); - }; pkgs-static = nixpkgs.legacyPackages.${system}.appendOverlays [ ocaml-overlays.overlays.default - dune-static-overlay + self.overlays.dune-static ]; add-experimental-configure-flags = pkg: pkg.overrideAttrs { @@ -267,21 +259,31 @@ }; }; }) // { - overlays.default = self: super: { - dune = with self; stdenv.mkDerivation { - pname = "dune"; - version = "n/a"; - src = ./.; - nativeBuildInputs = with ocamlPackages; [ ocaml findlib ]; - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - strictDeps = true; - buildFlags = [ "release" ]; - dontAddPrefix = true; - dontAddStaticConfigureFlags = true; - configurePlatforms = [ ]; - installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; + overlays = { + default = self: super: { + dune = with self; stdenv.mkDerivation { + pname = "dune"; + version = "n/a"; + src = ./.; + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; + strictDeps = true; + buildFlags = [ "release" ]; + dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = [ ]; + installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; + }; + }; + dune-static = self: super: { + ocamlPackages = super.ocaml-ng.ocamlPackages_5_1.overrideScope (oself: osuper: { + dune_3 = osuper.dune_3.overrideAttrs (a: { + src = ./.; + preBuild = "ocaml boot/bootstrap.ml --static"; + }); + }); }; }; };