summary refs log tree commit diff
path: root/pkgs/servers/zoneminder
diff options
context:
space:
mode:
authorDaniel Fullmer <danielrf12@gmail.com>2020-04-11 13:15:33 -0400
committerDaniel Fullmer <danielrf12@gmail.com>2020-04-11 13:37:15 -0400
commitfae01fa84b377657b645699bccc3b2b931e9940a (patch)
treeafe059ccf7918316e6d30f2150acd3f73b1f36cc /pkgs/servers/zoneminder
parent9b0d2f3fd153167b0c8ce84bb71e766a39ed4c9d (diff)
downloadnixpkgs-fae01fa84b377657b645699bccc3b2b931e9940a.tar
nixpkgs-fae01fa84b377657b645699bccc3b2b931e9940a.tar.gz
nixpkgs-fae01fa84b377657b645699bccc3b2b931e9940a.tar.bz2
nixpkgs-fae01fa84b377657b645699bccc3b2b931e9940a.tar.lz
nixpkgs-fae01fa84b377657b645699bccc3b2b931e9940a.tar.xz
nixpkgs-fae01fa84b377657b645699bccc3b2b931e9940a.tar.zst
nixpkgs-fae01fa84b377657b645699bccc3b2b931e9940a.zip
zoneminder: 1.34.3 -> 1.34.9
Also removed workaround which was included in ZoneMinder/zoneminder#2867
Diffstat (limited to 'pkgs/servers/zoneminder')
-rw-r--r--pkgs/servers/zoneminder/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index 93f22e77f87..978893d28ff 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -78,13 +78,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "zoneminder";
-  version = "1.34.3";
+  version = "1.34.9";
 
   src = fetchFromGitHub {
     owner  = "ZoneMinder";
     repo   = "zoneminder";
     rev    = version;
-    sha256 = "0jp7950v36gxxzkwdp5i0312s26czhfsl5ixdxfzn21cx31hhlg0";
+    sha256 = "1xvgfsm260a3v0vqgbk7m9jzayhcs4ysyadnnxajyrndjhn802ic";
   };
 
   patches = [
@@ -170,10 +170,6 @@ in stdenv.mkDerivation rec {
     "-DZM_CONFIG_DIR=${placeholder "out"}/etc/zoneminder"
     "-DZM_WEB_USER=${user}"
     "-DZM_WEB_GROUP=${user}"
-
-    # Workaround issue in CMakeLists.txt where ZM_CGIDIR set to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin
-    # But CMAKE_INSTALL_LIBEXECDIR is already an absolute path from cmake setup-hook
-    "-DZM_CGIDIR=${placeholder "out"}/libexec/zoneminder/cgi-bin"
   ];
 
   passthru = { inherit dirName; };