diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/tools/luaformatter | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/tools/luaformatter')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/luaformatter/default.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/tools/luaformatter/fix-lib-paths.patch | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/tools/luaformatter/default.nix b/nixpkgs/pkgs/development/tools/luaformatter/default.nix index 00d96a687a63..207ef4d9fe12 100644 --- a/nixpkgs/pkgs/development/tools/luaformatter/default.nix +++ b/nixpkgs/pkgs/development/tools/luaformatter/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4, libargs, catch2, cmake, libyamlcpp }: +{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, yaml-cpp }: + +let + antlr4 = antlr4_9; +in stdenv.mkDerivation rec { pname = "luaformatter"; @@ -15,13 +19,13 @@ stdenv.mkDerivation rec { (substituteAll { src = ./fix-lib-paths.patch; antlr4RuntimeCpp = antlr4.runtime.cpp.dev; - inherit libargs catch2 libyamlcpp; + inherit libargs catch2 yaml-cpp; }) ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ antlr4.runtime.cpp libyamlcpp ]; + buildInputs = [ antlr4.runtime.cpp yaml-cpp ]; meta = with lib; { description = "Code formatter for Lua"; diff --git a/nixpkgs/pkgs/development/tools/luaformatter/fix-lib-paths.patch b/nixpkgs/pkgs/development/tools/luaformatter/fix-lib-paths.patch index fce2347d8e0e..610a313ca27c 100644 --- a/nixpkgs/pkgs/development/tools/luaformatter/fix-lib-paths.patch +++ b/nixpkgs/pkgs/development/tools/luaformatter/fix-lib-paths.patch @@ -12,7 +12,7 @@ index 4a21b94..0ac7911 100644 - ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src + @libargs@/include + @catch2@/include -+ @libyamlcpp@/include ++ @yaml-cpp@/include + @antlr4RuntimeCpp@/include/antlr4-runtime ${PROJECT_SOURCE_DIR}/src/ ) |