diff options
author | Joseph Donofry | 2019-05-12 16:57:55 -0400 |
---|---|---|
committer | Joseph Donofry | 2019-05-12 16:57:55 -0400 |
commit | 159a82420a49e9f1ef4888bdf08949bba1675802 (patch) | |
tree | 889f2b49d90cb7d0558a82d6b1a24b5072911f1d | |
parent | c493ef95aa5bba1c1222f56679b3a5af4c8d0835 (diff) | |
download | aur-159a82420a49e9f1ef4888bdf08949bba1675802.tar.gz |
Use included JSON
-rw-r--r-- | .SRCINFO | 1 | ||||
-rw-r--r-- | PKGBUILD | 8 |
2 files changed, 4 insertions, 5 deletions
@@ -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 @@ -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 } |