git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #123343 from dotlambda/zoneminder-ffmpeg
166a930Sandro
pkgs/servers/zoneminder/default.nix+3−3
@@ -1,5 +1,5 @@
1{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config
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, polkit, util-linuxMinimal, x264, zlib
3, polkit, util-linuxMinimal, x264, zlib
4, coreutils, procps, psmisc, nixosTests }:
4, coreutils, procps, psmisc, nixosTests }:
5
5
@@ -138,7 +138,7 @@ in stdenv.mkDerivation rec {
138
138
139 for f in includes/Event.php views/image.php ; do
139 for f in includes/Event.php views/image.php ; do
140 substituteInPlace web/$f \
140 substituteInPlace web/$f \
141− --replace "'ffmpeg " "'${ffmpeg_3}/bin/ffmpeg "
141+ --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg "
142 done
142 done
143
143
144 substituteInPlace web/includes/functions.php \
144 substituteInPlace web/includes/functions.php \
@@ -147,7 +147,7 @@ in stdenv.mkDerivation rec {
147 '';
147 '';
148
148
149 buildInputs = [
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 util-linuxMinimal # for libmount
151 util-linuxMinimal # for libmount
152 ] ++ (with perlPackages; [
152 ] ++ (with perlPackages; [
153 # build-time dependencies
153 # build-time dependencies