diff --git a/flake.nix b/flake.nix index cccd1a3..d30671e 100644 --- a/flake.nix +++ b/flake.nix @@ -78,6 +78,7 @@ cabal-install zlib haskellPackages.neolua-bin + neorocks ]) ++ (with pre-commit-hooks.packages.${system}; [ hlint diff --git a/nix/overlay.nix b/nix/overlay.nix index b26ea4e..c11973d 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -38,9 +38,9 @@ with final.lib; let neovim-nightly = neovim-input.packages.${prev.system}.neovim; - mkNeoluaWrapper = neovim: + mkNeoluaWrapper = name: neovim: final.pkgs.writeShellApplication { - name = "neolua"; + inherit name; checkPhase = ""; runtimeInputs = [ haskellPackages.neolua-bin @@ -51,16 +51,16 @@ with final.lib; let ''; }; - neolua-stable-wrapper = mkNeoluaWrapper final.pkgs.neovim-unwrapped; + neolua-stable-wrapper = mkNeoluaWrapper "neolua" final.pkgs.neovim-unwrapped; - neolua-nightly-wrapper = mkNeoluaWrapper neovim-nightly; + neolua-nightly-wrapper = mkNeoluaWrapper "neolua-nightly" neovim-nightly; luajit = prev.pkgs.luajit.overrideDerivation (old: { postPatch = '' ${old.postPatch} mkdir -p $out/bin ln -s ${neolua-stable-wrapper}/bin/neolua $out/bin/neolua - ln -s ${neolua-nightly-wrapper}/bin/neolua $out/bin/neolua-nightly + ln -s ${neolua-nightly-wrapper}/bin/neolua-nightly $out/bin/neolua-nightly ''; }); @@ -74,6 +74,8 @@ with final.lib; let luarocks luajit luajit.pkgs.dkjson + neolua-stable-wrapper + neolua-nightly-wrapper ]; }; in {