diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.recipe b/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.recipe
index 3973ef2a6..ebbb0db43 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.recipe
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.recipe
@@ -1,44 +1,40 @@
 SUMMARY="JSON for Modern C++"
-DESCRIPTION="Header only library"
+DESCRIPTION="One-header JSON library with intuitive syntax."
 HOMEPAGE="https://github.com/nlohmann/json"
 COPYRIGHT="2013-2021 Niels Lohmann"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://github.com/nlohmann/json/archive/v$portVersion/json-$portVersion.tar.gz"
 CHECKSUM_SHA256="1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3"
+SOURCE_FILENAME="nlohmann-json.v$portVersion.tar.gz"
 SOURCE_DIR="json-$portVersion"
 
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="any"
 
 PROVIDES="
-	nlohmann_json$secondaryArchSuffix = $portVersion
-	devel:nlohmann_json$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
+	nlohmann_json = $portVersion
+	devel:nlohmann_json = $portVersion
 	"
 
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	"
 
 BUILD()
 {
-	sed -i -e "s|:include>|:${relativeIncludeDir}>|" CMakeLists.txt
+	sed -i -e "s|:include>|:${relativeIncludeDir}>|" \
+		-e "s/CMAKE_INSTALL_LIBDIR/CMAKE_INSTALL_DATADIR/g" CMakeLists.txt
 	cmake -B build -S . $cmakeDirArgs \
-		-DCMAKE_BUILD_TYPE=Release
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_CXX_COMPILER=/bin/true \
+		-Wno-dev \
+		-DJSON_MultipleHeaders=ON \
+		-DJSON_BuildTests=OFF
 	make -C build $jobArgs
 }
 
 INSTALL()
 {
 	make -C build install
-
-	fixPkgconfig
 }
diff --git a/dev-libs/nlohmann_json/nlohmann_json-3.9.1.recipe b/dev-libs/nlohmann_json/nlohmann_json-3.9.1.recipe
deleted file mode 100644
index 4f7873a5d..000000000
--- a/dev-libs/nlohmann_json/nlohmann_json-3.9.1.recipe
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY="JSON library for Modern C++"
-DESCRIPTION="One-header JSON library with intuitive syntax."
-HOMEPAGE="https://github.com/nlohmann/json"
-COPYRIGHT="2013-2020 Niels Lohmann"
-LICENSE="MIT"
-REVISION="1"
-SOURCE_URI="https://github.com/nlohmann/json/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b"
-SOURCE_FILENAME="nlohmann-json.v$portVersion.tar.gz"
-SOURCE_DIR="json-$portVersion/"
-
-ARCHITECTURES="any"
-
-PROVIDES="
-	nlohmann_json = $portVersion
-	devel:nlohmann_json = $portVersion
-	"
-
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:make
-	"
-
-BUILD()
-{
-	cmake $cmakeDirArgs -S. -Bbuild \
-		-DJSON_MultipleHeaders=ON \
-		-DJSON_BuildTests=OFF \
-		-DBUILD_TESTING=OFF \
-		-DCMAKE_CXX_COMPILER=/bin/true
-}
-
-INSTALL()
-{
-	cmake --build build --target install
-
-	fixPkgconfig
-
-	#fix cmake
-	sed -i 's,\/include,/'${relativeIncludeDir}',g' \
-		$libDir/cmake/nlohmann_json/nlohmann_jsonTargets.cmake
-}