zoneminder: 1.32.3 -> 1.34.3

2 files changed, 8 insertions, 22 deletions

diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index e536ea0373c..5ffb803d3a0 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -78,19 +78,17 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "zoneminder";
-  version = "1.32.3";
+  version = "1.34.3";
 
   src = fetchFromGitHub {
     owner  = "ZoneMinder";
     repo   = "zoneminder";
     rev    = version;
-    sha256 = "1sx2fn99861zh0gp8g53ynr1q6yfmymxamn82y54jqj6nv475njz";
+    sha256 = "0jp7950v36gxxzkwdp5i0312s26czhfsl5ixdxfzn21cx31hhlg0";
   };
 
   patches = [
     ./default-to-http-1dot1.patch
-    # Explicitly link with dynamic linking library to fix build
-    ./link-with-libdl.patch
   ];
 
   postPatch = ''
@@ -125,6 +123,10 @@ in stdenv.mkDerivation rec {
     substituteInPlace scripts/zmdbbackup.in \
       --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 \
              scripts/zmupdate.pl.in \
              src/zm_config.h.in \
@@ -133,7 +135,7 @@ in stdenv.mkDerivation rec {
       substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder
     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 \
        --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg "
    done
@@ -147,6 +149,7 @@ in stdenv.mkDerivation rec {
     DateManip DBI DBDmysql LWP SysMmap
     # run-time dependencies not checked at build-time
     ClassStdFast DataDump DeviceSerialPort JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
+    CryptEksblowfish DataEntropy # zmupdate.pl
   ]);
 
   nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
diff --git a/pkgs/servers/zoneminder/link-with-libdl.patch b/pkgs/servers/zoneminder/link-with-libdl.patch
deleted file mode 100644
index 53aaf9b25f7..00000000000
--- a/pkgs/servers/zoneminder/link-with-libdl.patch
+++ /dev/null
@@ -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)