public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63824 from JohnAZoidberg/zoneminder-alias 

nixos/zoneminder: Fix package and service build
This commit is contained in:
worldofpeace 2019-07-06 21:19:23 -04:00 committed by GitHub
parent 4a405d8995 543b131907
commit ab34f8b39b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/zoneminder.nix
View File

@ -262,7 +262,7 @@ in {
fastcgi_pass ${fcgi.socketType}:${fcgi.socketAddress}; fastcgi_pass ${fcgi.socketType}:${fcgi.socketAddress};
} }
location /cache { location /cache/ {
alias /var/cache/${dirName}; alias /var/cache/${dirName};
} }

2
pkgs/servers/zoneminder/default.nix
View File

@ -89,6 +89,8 @@ in stdenv.mkDerivation rec {
patches = [ patches = [
./default-to-http-1dot1.patch ./default-to-http-1dot1.patch
# Explicitly link with dynamic linking library to fix build
./link-with-libdl.patch
]; ];
postPatch = '' postPatch = ''

17
pkgs/servers/zoneminder/link-with-libdl.patch Normal file
View File

@ -0,0 +1,17 @@
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,10 +20,10 @@ add_executable(zms zms.cpp)
include_directories(libbcrypt/include/bcrypt)
include_directories(jwt-cpp/include/jwt-cpp)
-target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})
+target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})
+target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})
+target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})
# Generate man files for the binaries destined for the bin folder
FOREACH(CBINARY zma zmc zmu)