diff --git a/pkgs/maps/default.nix b/pkgs/maps/default.nix index 89cab95..721b9a1 100644 --- a/pkgs/maps/default.nix +++ b/pkgs/maps/default.nix @@ -84,4 +84,9 @@ in stdenv.mkDerivation { icon = "nix-snowflake"; # "${placeholder "out"}/share/icons/${pname}.svg"; }) ]; + + passthru = { + inherit lua luaPackages; + }; + } diff --git a/pkgs/maps/shell.nix b/pkgs/maps/shell.nix index ec8d430..2820c1b 100644 --- a/pkgs/maps/shell.nix +++ b/pkgs/maps/shell.nix @@ -1,8 +1,27 @@ with import {}; -let package = pkgs.callPackage ./. {}; +let + package = pkgs.callPackage ./. {}; + fennel-ls1 = + let inherit (pkgs) stdenv pandoc; + in stdenv.mkDerivation { + name = "fennel-ls"; + buildInputs = [ package.lua ]; + nativeBuildInputs = [ pandoc ]; + makeFlags = [ "PREFIX=\\$out" ]; + src = fetchFromSourcehut { + owner ="~xerool"; + repo ="fennel-ls"; + rev = "552b03b983c18d7db5053350711bef9088cc9110"; + hash = "sha256-npR10hzPYgDPbKWB5ueq8cXAWYvUEbVVJ1R/EEdCnVY="; + }; + }; + fennel-ls = pkgs.fennel-ls.override { inherit (package) lua luaPackages; }; in package.overrideAttrs(o: { + nativeBuildInputs = [ fennel-ls ] ++ o.nativeBuildInputs; shellHook = '' + mkdir -p bin + ( cd bin && ln -sf `type -p fennel-ls` `type -p fennel` . ) export LUA_CPATH=$(lua -e "print(package.cpath)") export LUA_PATH=$(lua -e "print(package.path)")\;$RXI_JSON/share/lua/5.3/?.lua '';