BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #85011 from danielfullmer/zoneminder-1.34.9

Browse source 
zoneminder: 1.34.3 -> 1.34.9
This commit is contained in:
Rok Garbas 2020-04-11 21:32:12 +02:00 committed by GitHub
commit dc75767b7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 {
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; };