diff options
author | Atemu <atemu.main@gmail.com> | 2023-03-03 19:41:10 +0100 |
---|---|---|
committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-03-13 16:42:22 -0600 |
commit | 9bd2506458ea053ccbcde6e622d7cec9993d8f36 (patch) | |
tree | 7008491e4fcfb755a2cd2dc49465c94cd5a4c282 /pkgs/tools | |
parent | 711e9cfd493296681b84147a650972ea78e948c4 (diff) |
treewide: make ffmpeg_4-dependant packages depend on ffmpeg_4
These packages were identified as broken when ffmpeg = ffmpeg_5. Tested _only_ by building them. If you are a maintainer of one of these packages, please test whether your package still works.
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/audio/acoustid-fingerprinter/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/audio/loudgain/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/vulkan-cts/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/video/harvid/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/video/untrunc-anthwlock/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/video/xjadeo/default.nix | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 4fc3d957e13d8..21dc009e33dd1 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, qt4, taglib, chromaprint, ffmpeg }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, qt4, taglib, chromaprint, ffmpeg_4 }: stdenv.mkDerivation rec { pname = "acoustid-fingerprinter"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qt4 taglib chromaprint ffmpeg ]; + buildInputs = [ qt4 taglib chromaprint ffmpeg_4 ]; cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${lib.getVersion taglib}" ]; diff --git a/pkgs/tools/audio/loudgain/default.nix b/pkgs/tools/audio/loudgain/default.nix index 9d4a9444b7fc7..caf1294c751f3 100644 --- a/pkgs/tools/audio/loudgain/default.nix +++ b/pkgs/tools/audio/loudgain/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg, libebur128 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg_4, libebur128 , libresample, taglib, zlib }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ffmpeg libebur128 libresample taglib zlib ]; + buildInputs = [ ffmpeg_4 libebur128 libresample taglib zlib ]; postInstall = '' sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm" diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index 003a3c18bfbf6..0835540d92d85 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchurl , cmake -, ffmpeg +, ffmpeg_4 , libdrm , libglvnd , libffi @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { ''; buildInputs = [ - ffmpeg + ffmpeg_4 libdrm libffi libglvnd diff --git a/pkgs/tools/video/harvid/default.nix b/pkgs/tools/video/harvid/default.nix index 90ed6d425869e..655d1ba3874ff 100644 --- a/pkgs/tools/video/harvid/default.nix +++ b/pkgs/tools/video/harvid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ffmpeg, libjpeg, libpng, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ffmpeg_4, libjpeg, libpng, pkg-config }: stdenv.mkDerivation rec { pname = "harvid"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg libjpeg libpng ]; + buildInputs = [ ffmpeg_4 libjpeg libpng ]; makeFlags = [ "DESTDIR=$(out)" "libdir=\"/lib\"" ]; diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index c127bfe8740ed..33ec940aebc46 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ffmpeg, libui }: +{ lib, stdenv, fetchFromGitHub, ffmpeg_4, libui }: stdenv.mkDerivation { pname = "untrunc-anthwlock"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp"; }; - buildInputs = [ ffmpeg libui ]; + buildInputs = [ ffmpeg_4 libui ]; buildPhase = '' runHook preBuild diff --git a/pkgs/tools/video/xjadeo/default.nix b/pkgs/tools/video/xjadeo/default.nix index e638278f8ba8e..e7c237e1698ed 100644 --- a/pkgs/tools/video/xjadeo/default.nix +++ b/pkgs/tools/video/xjadeo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg, freetype, libGLU +{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg_4, freetype, libGLU , libjack2, liblo, libX11, libXv, pkg-config, portmidi, xorg }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - ffmpeg + ffmpeg_4 libjack2 libX11 xorg.libXext |