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

Merge pull request #123343 from dotlambda/zoneminder-ffmpeg 

zoneminder: use ffmpeg instead of ffmpeg_3
This commit is contained in:
Sandro 2021-05-18 02:07:08 +02:00 committed by GitHub
parent 570d58be31 3d92fac40e
commit 166a930ae8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config { stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config
, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages , curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages
, polkit, util-linuxMinimal, x264, zlib , polkit, util-linuxMinimal, x264, zlib
, coreutils, procps, psmisc, nixosTests }: , coreutils, procps, psmisc, nixosTests }:
@ -138,7 +138,7 @@ in stdenv.mkDerivation rec {
for f in includes/Event.php views/image.php ; do for f in includes/Event.php views/image.php ; do
substituteInPlace web/$f \ substituteInPlace web/$f \
--replace "'ffmpeg " "'${ffmpeg_3}/bin/ffmpeg " --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg "
done done
substituteInPlace web/includes/functions.php \ substituteInPlace web/includes/functions.php \
@ -147,7 +147,7 @@ in stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib curl ffmpeg glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib
util-linuxMinimal # for libmount util-linuxMinimal # for libmount
] ++ (with perlPackages; [ ] ++ (with perlPackages; [
# build-time dependencies # build-time dependencies