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

zoneminder: 1.32.3 -> 1.34.3

Browse Source
This commit is contained in:
Daniel Fullmer
2020-03-07 12:59:36 -05:00
parent b7566d7715
commit 2685e457d3
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/zoneminder/default.nix
+8 -5
View File
@@ -78,19 +78,17 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "zoneminder"; pname = "zoneminder";
version = "1.32.3"; version = "1.34.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ZoneMinder"; owner = "ZoneMinder";
repo = "zoneminder"; repo = "zoneminder";
rev = version; rev = version;
sha256 = "1sx2fn99861zh0gp8g53ynr1q6yfmymxamn82y54jqj6nv475njz"; sha256 = "0jp7950v36gxxzkwdp5i0312s26czhfsl5ixdxfzn21cx31hhlg0";
}; };
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 = ''
@@ -125,6 +123,10 @@ in stdenv.mkDerivation rec {
substituteInPlace scripts/zmdbbackup.in \ substituteInPlace scripts/zmdbbackup.in \
--replace /usr/bin/mysqldump ${mysql.client}/bin/mysqldump --replace /usr/bin/mysqldump ${mysql.client}/bin/mysqldump
substituteInPlace scripts/zmupdate.pl.in \
--replace "'mysql'" "'${mysql.client}/bin/mysql'" \
--replace "'mysqldump'" "'${mysql.client}/bin/mysqldump'"
for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \ for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \
scripts/zmupdate.pl.in \ scripts/zmupdate.pl.in \
src/zm_config.h.in \ src/zm_config.h.in \
@@ -133,7 +135,7 @@ in stdenv.mkDerivation rec {
substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder
done done
for f in includes/Event.php views/image.php skins/classic/views/image-ffmpeg.php ; do for f in includes/Event.php views/image.php ; do
substituteInPlace web/$f \ substituteInPlace web/$f \
--replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg " --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg "
done done
@@ -147,6 +149,7 @@ in stdenv.mkDerivation rec {
DateManip DBI DBDmysql LWP SysMmap DateManip DBI DBDmysql LWP SysMmap
# run-time dependencies not checked at build-time # run-time dependencies not checked at build-time
ClassStdFast DataDump DeviceSerialPort JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate ClassStdFast DataDump DeviceSerialPort JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
CryptEksblowfish DataEntropy # zmupdate.pl
]); ]);
nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
pkgs/servers/zoneminder/link-with-libdl.patch
-17
View File
@@ -1,17 +0,0 @@
--- 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)