diff options
| author | OPNA2608 <christoph.neidahl@gmail.com> | 2023-01-29 15:44:19 +0100 |
|---|---|---|
| committer | OPNA2608 <christoph.neidahl@gmail.com> | 2023-01-31 16:22:54 +0100 |
| commit | c9b4c7dccdbf196fbe1113ef27da7da17f84b994 (patch) | |
| tree | 4676c29c45945bdd0bb959c5c7f7deb483a066c7 /pkgs/development/tools/luaformatter | |
| parent | 4cb50969147bbadd48b0b6964727db98b2b31508 (diff) | |
treewide: Rename libyamlcpp* to yaml-cpp*
Diffstat (limited to 'pkgs/development/tools/luaformatter')
| -rw-r--r-- | pkgs/development/tools/luaformatter/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/luaformatter/fix-lib-paths.patch | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/luaformatter/default.nix b/pkgs/development/tools/luaformatter/default.nix index b2d719267a624..207ef4d9fe125 100644 --- a/pkgs/development/tools/luaformatter/default.nix +++ b/pkgs/development/tools/luaformatter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, libyamlcpp }: +{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, yaml-cpp }: let antlr4 = antlr4_9; @@ -19,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/pkgs/development/tools/luaformatter/fix-lib-paths.patch b/pkgs/development/tools/luaformatter/fix-lib-paths.patch index fce2347d8e0e8..610a313ca27c8 100644 --- a/pkgs/development/tools/luaformatter/fix-lib-paths.patch +++ b/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/ ) |