diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/livepeer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mediatomb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mpd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/roon-server/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/tvheadend/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/zoneminder/default.nix | 6 |
7 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 4ea74019692b..9fcb3305f0ac 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -413,7 +413,7 @@ in rev = "0.9.0"; sha256 = "1b0v471mzbcys73pzr7gpvzzhff0cva0l5ff32cv7z1v9c0ypji7"; }; - inputs = [ pkgs.ffmpeg ]; + inputs = [ pkgs.ffmpeg_3 ]; }; vts = { diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index d401d3ada5e1..38eb336ba219 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, buildGoPackage -, pkgconfig, ffmpeg +, pkgconfig, ffmpeg_3 }: buildGoPackage rec { @@ -18,7 +18,7 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ffmpeg ]; + buildInputs = [ ffmpeg_3 ]; enableParallelBuilding = true; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index 17bfdef2a30d..d996a6ad0ef2 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit -, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg, file +, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg_3, file , pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd"; }; - buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file mp4v2 flac + buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg_3 file mp4v2 flac pkgconfig autoreconfHook ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 44118277a28b..b801020a6652 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -4,7 +4,7 @@ # Archive support , bzip2, zziplib # Codecs -, audiofile, faad2, ffmpeg, flac, fluidsynth, game-music-emu +, audiofile, faad2, ffmpeg_3, flac, fluidsynth, game-music-emu , libmad, libmikmod, mpg123, libopus, libvorbis, lame # Filters , libsamplerate @@ -46,7 +46,7 @@ let # Decoder plugins audiofile = [ audiofile ]; faad = [ faad2 ]; - ffmpeg = [ ffmpeg ]; + ffmpeg = [ ffmpeg_3 ]; flac = [ flac ]; fluidsynth = [ fluidsynth ]; gme = [ game-music-emu ]; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 49eaa26c2947..a5924e37331d 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, alsaUtils, cifs-utils, fetchurl, ffmpeg, libav, mono, stdenv }: +{ alsaLib, alsaUtils, cifs-utils, fetchurl, ffmpeg_3, libav, mono, stdenv }: with stdenv.lib; stdenv.mkDerivation rec { @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { runHook preInstall # Check script - sed -i '3i PATH=$PATH:${makeBinPath [ cifs-utils ffmpeg libav ]}' check.sh + sed -i '3i PATH=$PATH:${makeBinPath [ cifs-utils ffmpeg_3 libav ]}' check.sh sed -i '/check_ulimit$/d' check.sh # Start script - sed -i '3i PATH=$PATH:${makeBinPath [ alsaUtils cifs-utils ffmpeg libav ]}' start.sh + sed -i '3i PATH=$PATH:${makeBinPath [ alsaUtils cifs-utils ffmpeg_3 libav ]}' start.sh # Debug logging sed -i '/--debug--gc=sgen --server/exec "$HARDLINK" --debug --gc=sgen --server "$SCRIPT.exe" "$@" -storagetrace -watchertrace' Appliance/RoonAppliance diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 009dd9bfc43f..f97935a4ce39 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig -, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg, libiconv, openssl, python +, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_3, libiconv, openssl, python , which, zlib }: let @@ -17,7 +17,7 @@ in stdenv.mkDerivation { }; buildInputs = [ - avahi dbus gettext git gnutar gzip bzip2 ffmpeg libiconv openssl python + avahi dbus gettext git gnutar gzip bzip2 ffmpeg_3 libiconv openssl python which zlib ]; diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 8dcbe36850af..146705fb3d92 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig -, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages +, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, utillinuxMinimal, 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}/bin/ffmpeg " + --replace "'ffmpeg " "'${ffmpeg_3}/bin/ffmpeg " done substituteInPlace web/includes/functions.php \ @@ -147,7 +147,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - curl ffmpeg glib libjpeg libselinux libsepol mp4v2 libmysqlclient mysql.client pcre perl polkit x264 zlib + curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mysql.client pcre perl polkit x264 zlib utillinuxMinimal # for libmount ] ++ (with perlPackages; [ # build-time dependencies |