From 159a82420a49e9f1ef4888bdf08949bba1675802 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 12 May 2019 16:57:55 -0400 Subject: [PATCH] Use included JSON --- .SRCINFO | 1 - PKGBUILD | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 21b826d..41ac253 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -11,7 +11,6 @@ pkgbase = nheko-git makedepends = gcc makedepends = fontconfig makedepends = qt5-tools - makedepends = nlohmann-json depends = qt5-base depends = lmdb depends = qt5-multimedia diff --git a/PKGBUILD b/PKGBUILD index 4f686ad..b81d73c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,7 +11,7 @@ url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "boost" "libsodium" "openssl" "cmark") -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") provides=("nheko") conflicts=("nheko") @@ -33,13 +33,13 @@ build() { rm -f cmake/FindOlm.cmake - cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=OFF + cmake -Hdeps -B.deps -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=ON cmake --build .deps cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ -DLMDBXX_INCLUDE_DIR=.deps/usr/include \ - -DTWEENY_INCLUDE_DIR=.deps/usr/include - -DJSON_INCLUDE_DIR=/usr/include + -DTWEENY_INCLUDE_DIR=.deps/usr/include \ + -DCMAKE_INSTALL_PREFIX=.deps/usr cmake --build build }