diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/devshell.nix | 6 | ||||
| -rw-r--r-- | nix/doc/gi-docgen.patch | 17 | ||||
| -rw-r--r-- | nix/lua.nix | 7 |
3 files changed, 25 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/doc/gi-docgen.patch b/nix/doc/gi-docgen.patch new file mode 100644 index 0000000..0ecb4bd --- /dev/null +++ b/nix/doc/gi-docgen.patch @@ -0,0 +1,17 @@ +diff --git a/gidocgen/gir/parser.py b/gidocgen/gir/parser.py +index e62835d..7ee60fa 100644 +--- a/gidocgen/gir/parser.py ++++ b/gidocgen/gir/parser.py +@@ -288,7 +288,11 @@ class GirParser: + + content = child.text or "" + +- return ast.Doc(content=content, filename=child.attrib['filename'], line=int(child.attrib['line'])) ++ return ast.Doc( ++ content=content, ++ filename=child.attrib.get('filename', ''), ++ line=int(child.attrib.get('line', 0)), ++ ) + + def _maybe_parse_source_position(self, node: ET.Element) -> T.Optional[ast.SourcePosition]: + child = node.find('core:source-position', GI_NAMESPACES) diff --git a/nix/lua.nix b/nix/lua.nix index 6b0b802..d4221f1 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/astal"; 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 = '' |