From 2f71cd4c08bb4514efe43533e6a5d03535204c29 Mon Sep 17 00:00:00 2001
From: Aylur <k.demeter@protonmail.com>
Date: Tue, 15 Oct 2024 01:26:32 +0200
Subject: refactor lua and gjs lib

---
 nix/lua.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'nix/lua.nix')

diff --git a/nix/lua.nix b/nix/lua.nix
index 6b0b802..549c6c3 100644
--- a/nix/lua.nix
+++ b/nix/lua.nix
@@ -12,11 +12,11 @@ defaults: {
       ps.lgi
       (ps.luaPackages.toLuaModule (pkgs.stdenvNoCC.mkDerivation {
         name = "astal";
-        src = "${astal}/core/lua";
+        src = "${astal}/lang/lua";
         dontBuild = true;
         installPhase = ''
           mkdir -p $out/share/lua/${ps.lua.luaversion}/astal
-          cp -r astal/* $out/share/lua/${ps.lua.luaversion}/astal
+          cp -r * $out/share/lua/${ps.lua.luaversion}/astal
         '';
       }))
       (ps.luaPackages.toLuaModule (pkgs.stdenvNoCC.mkDerivation {
@@ -46,7 +46,8 @@ in
       extraPackages
       ++ [
         lua
-        astal.packages.${pkgs.system}.default
+        astal.packages.${pkgs.system}.io
+        astal.packages.${pkgs.system}.astal3
       ];
 
     installPhase = ''
-- 
cgit v1.2.3


From 4a5308c82e0134f87b7e1ccc56e4fa2778b69fdd Mon Sep 17 00:00:00 2001
From: Aylur <k.demeter@protonmail.com>
Date: Sat, 26 Oct 2024 11:50:43 +0200
Subject: fix: lua flake and lib

---
 nix/lua.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nix/lua.nix')

diff --git a/nix/lua.nix b/nix/lua.nix
index 549c6c3..d4221f1 100644
--- a/nix/lua.nix
+++ b/nix/lua.nix
@@ -12,7 +12,7 @@ defaults: {
       ps.lgi
       (ps.luaPackages.toLuaModule (pkgs.stdenvNoCC.mkDerivation {
         name = "astal";
-        src = "${astal}/lang/lua";
+        src = "${astal}/lang/lua/astal";
         dontBuild = true;
         installPhase = ''
           mkdir -p $out/share/lua/${ps.lua.luaversion}/astal
-- 
cgit v1.2.3