Merge pull request #123343 from dotlambda/zoneminder-ffmpeg

zoneminder: use ffmpeg instead of ffmpeg_3

authored by

Sandro and committed by
GitHub
166a930a 570d58be

+3 -3
+3 -3
pkgs/servers/zoneminder/default.nix
··· 1 1 { stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config 2 - , curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages 2 + , curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages 3 3 , polkit, util-linuxMinimal, x264, zlib 4 4 , coreutils, procps, psmisc, nixosTests }: 5 5 ··· 138 138 139 139 for f in includes/Event.php views/image.php ; do 140 140 substituteInPlace web/$f \ 141 - --replace "'ffmpeg " "'${ffmpeg_3}/bin/ffmpeg " 141 + --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg " 142 142 done 143 143 144 144 substituteInPlace web/includes/functions.php \ ··· 147 147 ''; 148 148 149 149 buildInputs = [ 150 - curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib 150 + curl ffmpeg glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib 151 151 util-linuxMinimal # for libmount 152 152 ] ++ (with perlPackages; [ 153 153 # build-time dependencies