Unverified Commit 0155efca authored by Austin Horstman's avatar Austin Horstman Committed by GitHub
Browse files

luaPackages.ltreesitter{,-ts}: move env variables into env for structuredAttrs (#507593)

parents b3063ae3 7d4b9e18

pkgs/development/lua-modules/overrides.nix

+8 −4
Original line number Diff line number Diff line
@@ -450,8 +450,10 @@ in 
        --replace-fail '"tree-sitter/lib/include",' '"${tree-sitter}/include"' \

        --replace-fail '"tree-sitter/lib/src"' ""

    '';

    env = old.env // {

      NIX_CFLAGS_COMPILE = "-I${tree-sitter}/include";

      NIX_LDFLAGS = "-L${tree-sitter}/lib -ltree-sitter";

    };

  });



  ltreesitter-ts = prev.ltreesitter-ts.overrideAttrs (old: {
@@ -465,8 +467,10 @@ in 
      hash = "sha256-hKM5HQU7A08mA004ZMV7hIVq/2WR3KocMatnTplM8uU=";

    };

    nativeBuildInputs = old.nativeBuildInputs ++ [ icu ];

    env = old.env // {

      NIX_CFLAGS_COMPILE = "-I${lib.getDev icu}/include";

      NIX_LDFLAGS = "-L${lib.getLib icu}/lib -licuuc -licui18n -licudata";

    };

  });



  lua-cmsgpack = prev.lua-cmsgpack.overrideAttrs {