treewide: Rename libyamlcpp* to yaml-cpp*

7 files changed, 9 insertions, 9 deletions

diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix
index 4fc6489130dc0..7daa4ad19e57a 100644
--- a/pkgs/development/libraries/librime/default.nix
+++ b/pkgs/development/libraries/librime/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
-  libyamlcpp, gtest, capnproto, pkg-config, plugins ? [ ] }:
+  yaml-cpp, gtest, capnproto, pkg-config, plugins ? [ ] }:
 
 let
   copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest capnproto ]
+  buildInputs = [ boost glog leveldb marisa opencc yaml-cpp gtest capnproto ]
               ++ plugins; # for propagated build inputs
 
   preConfigure = copyPlugins;
diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix
index 2941a1a1e7cea..0355b99774489 100644
--- a/pkgs/development/libraries/opencolorio/1.x.nix
+++ b/pkgs/development/libraries/opencolorio/1.x.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DUSE_EXTERNAL_LCMS=ON"
     "-DUSE_EXTERNAL_TINYXML=ON"
-    # External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
+    # External yaml-cpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
     "-DUSE_EXTERNAL_YAML=OFF"
   ] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON"
     ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF"
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 4cf75039c49e7..3d8a5588043fe 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , cmake
 , expat
-, libyamlcpp
+, yaml-cpp
 , ilmbase
 , pystring
 , imath
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     expat
-    libyamlcpp
+    yaml-cpp
     ilmbase
     pystring
     imath
diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.0.nix b/pkgs/development/libraries/yaml-cpp/0.3.0.nix
index fad3397b74b6f..fad3397b74b6f 100644
--- a/pkgs/development/libraries/libyaml-cpp/0.3.0.nix
+++ b/pkgs/development/libraries/yaml-cpp/0.3.0.nix
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/yaml-cpp/default.nix
index c9468b10b99be..c9468b10b99be 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/yaml-cpp/default.nix
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/
    )