schmittlauch/nixos-seafile-overlay
1
0
Fork 0
Code Issues 7 Pull requests Releases Wiki Activity

make all dependecies build by working around libevhtp issues

Browse source
This commit is contained in:
Trolli Schmittlauch 2019-10-09 00:54:56 +02:00
parent 990d57ca20
commit d554161784
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libevhtp/default.nix
View file

@ -18,7 +18,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libevent pth openssl ]; buildInputs = [ libevent pth openssl ];
propagatedBuildInputs = [ oniguruma ]; propagatedBuildInputs = [ oniguruma ];
cmakeFlags = [ "-DEVHTP_DISABLE_SSL=OFF" "-DEVHTP_BUILD_SHARED=ON" ]; # fix pkgconfig librarypath generation
patches = [ ./pkgconfig-librarypath.patch ];
#cmakeFlags = [ "-DEVHTP_DISABLE_SSL=OFF" "-DEVHTP_BUILD_SHARED=ON" ];
cmakeFlags = [ "-DEVHTP_DISABLE_SSL=OFF" "-DBUILD_SHARED_LIBS=ON" ];
outputs = [ "dev" "out" ];
meta = { meta = {
description = "Create extremely-fast and secure embedded HTTP servers with ease."; description = "Create extremely-fast and secure embedded HTTP servers with ease.";

20
libevhtp/pkgconfig-librarypath.patch Normal file
View file

@ -0,0 +1,20 @@
Author: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Sat Sep 14 20:32:03 2019 +0200
fix #143 by setting LIB_INSTALL_DIR CMake var
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 481ddd0..833ddf9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,6 +225,10 @@ set(include_install_dir "include")
set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
+if (NOT LIB_INSTALL_DIR)
+ set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+endif (NOT LIB_INSTALL_DIR)
+
# Configuration
set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")