diff options
| author | Aylur <[email protected]> | 2024-10-15 15:30:04 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-10-15 15:30:04 +0200 |
| commit | cbe650afb31c24faea6da45b4aeeffc6e964969d (patch) | |
| tree | d5c3788835ca7e50d68cd023026e7738f39f6f71 /nix | |
| parent | bdb23e20f171da7c769cba9e393d7e406e563a78 (diff) | |
| parent | bafd48d3df9b43a1d49ec015eff30619d595468b (diff) | |
Merge pull request #46 from Aylur/small-refactor
Small refactor
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/devshell.nix | 6 | ||||
| -rw-r--r-- | nix/lua.nix | 7 |
2 files changed, 8 insertions, 5 deletions
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 = '' |