diff options
| author | Kevin <[email protected]> | 2024-10-16 00:49:16 -0300 |
|---|---|---|
| committer | Kevin <[email protected]> | 2024-10-16 00:49:16 -0300 |
| commit | 2b1e8501b46056b79d97e90c6ec94e3ad36d0ab2 (patch) | |
| tree | 6486e98bd1ba523b1aeb4bd2566d1ff6e5c41798 /nix | |
| parent | 03f2c4706faba7dac5aee71b10255eac218cbeec (diff) | |
| parent | 236487001ab2a6c9c8e87e5db0ced9e5ab3ed791 (diff) | |
Merge branch 'adapt-upstream-changes'
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 = '' |