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

zoneminder: 1.34.3 -> 1.34.9

Browse Source 
Also removed workaround which was included in ZoneMinder/zoneminder#2867
This commit is contained in:
Daniel Fullmer 2020-04-11 13:15:33 -04:00
parent 9b0d2f3fd1
commit fae01fa84b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,13 +78,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "zoneminder"; pname = "zoneminder";
version = "1.34.3"; version = "1.34.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ZoneMinder"; owner = "ZoneMinder";
repo = "zoneminder"; repo = "zoneminder";
rev = version; rev = version;
sha256 = "0jp7950v36gxxzkwdp5i0312s26czhfsl5ixdxfzn21cx31hhlg0"; sha256 = "1xvgfsm260a3v0vqgbk7m9jzayhcs4ysyadnnxajyrndjhn802ic";
}; };
patches = [ patches = [
@ -170,10 +170,6 @@ in stdenv.mkDerivation rec {
"-DZM_CONFIG_DIR=${placeholder "out"}/etc/zoneminder" "-DZM_CONFIG_DIR=${placeholder "out"}/etc/zoneminder"
"-DZM_WEB_USER=${user}" "-DZM_WEB_USER=${user}"
"-DZM_WEB_GROUP=${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; }; passthru = { inherit dirName; };