summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Schütz <dev@schuetz-co.de>2021-05-17 11:47:43 +0200
committerRobert Schütz <dev@schuetz-co.de>2021-05-17 11:47:43 +0200
commit3d92fac40e57c675dbed5256e62929824703b14d (patch)
tree1ef699d5d203302fc1c1b789d70900a6a1eb4598
parent1e85864c6f7afe8ba44ee0cde0ad29f9ab80c137 (diff)
downloadnixpkgs-3d92fac40e57c675dbed5256e62929824703b14d.tar
nixpkgs-3d92fac40e57c675dbed5256e62929824703b14d.tar.gz
nixpkgs-3d92fac40e57c675dbed5256e62929824703b14d.tar.bz2
nixpkgs-3d92fac40e57c675dbed5256e62929824703b14d.tar.lz
nixpkgs-3d92fac40e57c675dbed5256e62929824703b14d.tar.xz
nixpkgs-3d92fac40e57c675dbed5256e62929824703b14d.tar.zst
nixpkgs-3d92fac40e57c675dbed5256e62929824703b14d.zip
zoneminder: use ffmpeg instead of ffmpeg_3
-rw-r--r--pkgs/servers/zoneminder/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index c4e9e915381..2ea162b0d60 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -1,5 +1,5 @@
 { 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
 , coreutils, procps, psmisc, nixosTests }:
 
@@ -138,7 +138,7 @@ in stdenv.mkDerivation rec {
 
     for f in includes/Event.php views/image.php ; do
       substituteInPlace web/$f \
-        --replace "'ffmpeg " "'${ffmpeg_3}/bin/ffmpeg "
+        --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg "
     done
 
     substituteInPlace web/includes/functions.php \
@@ -147,7 +147,7 @@ in stdenv.mkDerivation rec {
   '';
 
   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
   ] ++ (with perlPackages; [
     # build-time dependencies