From fc44d7f195674464e1402dffedd2822c7f5d8a5d Mon Sep 17 00:00:00 2001 From: haxala1r Date: Tue, 9 Dec 2025 19:43:26 +0300 Subject: [PATCH] Reorganize flake, remove unnecessary prebuild phase --- flake.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index b262aed..7a552e6 100644 --- a/flake.nix +++ b/flake.nix @@ -7,21 +7,18 @@ outputs = {self, nixpkgs}: let pkgs = nixpkgs.legacyPackages.x86_64-linux; + nativeOcamlInputs = with pkgs.ocamlPackages; [menhir merlin dune_3]; + nativeInputs = with pkgs; [ocaml]; in { packages.x86_64-linux.default = pkgs.ocamlPackages.buildDunePackage { pname = "ollisp"; version = "0.0.1"; src = pkgs.lib.cleanSource ./.; - preBuildPhase = "ls -R"; - nativeBuildInputs = with pkgs; [ - ocamlPackages.menhir - ]; + nativeBuildInputs = nativeInputs ++ nativeOcamlInputs; }; devShells.x86_64-linux.default = pkgs.mkShell { - nativeBuildInputs = with pkgs.ocamlPackages; [ - menhir merlin dune_3 - ]; + nativeBuildInputs = nativeInputs ++ nativeOcamlInputs; }; }; }