Unverified Commit ac8d05ea authored by Matthieu Coudron's avatar Matthieu Coudron Committed by GitHub
Browse files

luaPackages.tree-sitter-orgmode: fix build with strictDeps (#483635)

parents 397d245e 14395112

maintainers/scripts/luarocks-packages.csv

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ tl,,,,,,mephistophiles 
toml-edit,,,,,5.1,mrcjkb

tree-sitter-http,,,,0.0.33-1,,

tree-sitter-norg,,,,,5.1,mrcjkb

tree-sitter-orgmode,,,,,,

tree-sitter-orgmode,,,,,5.1,

vstruct,,,,,,

vusted,,,,,,

xml2lua,,,,,,teto

pkgs/development/lua-modules/overrides.nix

+7 −1
Original line number Diff line number Diff line
@@ -1173,9 +1173,12 @@ in 
      ++ [

        lua.pkgs.luarocks-build-treesitter-parser-cpp

      ];



    meta.broken = lua.luaversion != "5.1";

  });



  tree-sitter-orgmode = prev.tree-sitter-orgmode.overrideAttrs (old: {

    strictDeps = true; # can be removed after february 2026

    propagatedBuildInputs =

      let

        # HACK: luarocks-nix puts rockspec build dependencies in the nativeBuildInputs,
@@ -1185,11 +1188,14 @@ in 
      old.propagatedBuildInputs

      ++ [

        lua.pkgs.luarocks-build-treesitter-parser

        tree-sitter

      ];

    nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [

      writableTmpDirAsHomeHook

      tree-sitter

    ];



    # should be fixed upstream

    meta.broken = lua.luaversion != "5.1";

  });



  vstruct = prev.vstruct.overrideAttrs (_: {