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/devshell.nix | 6 ++++--
 nix/lua.nix      | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'nix')

diff --git a/nix/devshell.nix b/nix/devshell.nix
index 936f4b4..f5aa18c 100644
--- a/nix/devshell.nix
+++ b/nix/devshell.nix
@@ -6,11 +6,11 @@
     ps.lgi
     (ps.luaPackages.toLuaModule (pkgs.stdenv.mkDerivation {
       name = "astal";
-      src = "${self}/core/lua";
+      src = "${self}/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
       '';
     }))
   ]);
@@ -28,7 +28,9 @@
     ninja
     vala
     gtk3
+    gtk4
     gtk-layer-shell
+    gtk4-layer-shell
     json-glib
     pam
     gvfs
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