Use included JSON
							parent
							
								
									c493ef95aa
								
							
						
					
					
						commit
						159a82420a
					
				
							
								
								
									
										1
									
								
								.SRCINFO
								
								
								
								
							
							
						
						
									
										1
									
								
								.SRCINFO
								
								
								
								
							|  | @ -11,7 +11,6 @@ pkgbase = nheko-git | ||||||
| 	makedepends = gcc | 	makedepends = gcc | ||||||
| 	makedepends = fontconfig | 	makedepends = fontconfig | ||||||
| 	makedepends = qt5-tools | 	makedepends = qt5-tools | ||||||
| 	makedepends = nlohmann-json |  | ||||||
| 	depends = qt5-base | 	depends = qt5-base | ||||||
| 	depends = lmdb | 	depends = lmdb | ||||||
| 	depends = qt5-multimedia | 	depends = qt5-multimedia | ||||||
|  |  | ||||||
							
								
								
									
										8
									
								
								PKGBUILD
								
								
								
								
							
							
						
						
									
										8
									
								
								PKGBUILD
								
								
								
								
							|  | @ -11,7 +11,7 @@ url="https://github.com/Nheko-Reborn/nheko" | ||||||
| license=("GPL3") | license=("GPL3") | ||||||
| 
 | 
 | ||||||
| depends=("qt5-base" "lmdb" "qt5-multimedia" "qt5-svg" "boost" "libsodium" "openssl" "cmark") | 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") | provides=("nheko") | ||||||
| conflicts=("nheko") | conflicts=("nheko") | ||||||
|  | @ -33,13 +33,13 @@ build() { | ||||||
| 
 | 
 | ||||||
|     rm -f cmake/FindOlm.cmake |     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 --build .deps | ||||||
| 
 | 
 | ||||||
|     cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ |     cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ | ||||||
|         -DLMDBXX_INCLUDE_DIR=.deps/usr/include \ |         -DLMDBXX_INCLUDE_DIR=.deps/usr/include \ | ||||||
|         -DTWEENY_INCLUDE_DIR=.deps/usr/include |         -DTWEENY_INCLUDE_DIR=.deps/usr/include \ | ||||||
|         -DJSON_INCLUDE_DIR=/usr/include |         -DCMAKE_INSTALL_PREFIX=.deps/usr | ||||||
|     cmake --build build |     cmake --build build | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue