From 61922738bbdfee7c34dffb8ab6facc04b015011e Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 27 Aug 2024 22:52:44 +0100 Subject: [PATCH] treewide: optimistically unpin FFmpeg 7 dependencies Per the adjusted FFmpeg pinning advice, packages that work on the default version should use the unversioned variants to ease the migration to future versions and reduce the number of packages that end up referencing old versions. I have left HandBrake pinned as it builds a custom patched FFmpeg. --- nixos/modules/services/video/go2rtc/default.nix | 4 ++-- pkgs/applications/audio/audacity/default.nix | 6 +++--- pkgs/applications/audio/keyfinder-cli/default.nix | 4 ++-- pkgs/applications/audio/moc/default.nix | 4 ++-- pkgs/applications/audio/pianobar/default.nix | 4 ++-- pkgs/applications/emulators/retroarch/default.nix | 4 ++-- pkgs/applications/graphics/openboard/default.nix | 4 ++-- pkgs/applications/kde/ffmpegthumbs.nix | 4 ++-- pkgs/applications/science/networking/sumo/default.nix | 4 ++-- pkgs/applications/video/dvdstyler/default.nix | 4 ++-- pkgs/applications/video/mplayer/default.nix | 4 ++-- pkgs/applications/video/simplescreenrecorder/default.nix | 4 ++-- pkgs/applications/video/webcamoid/default.nix | 4 ++-- pkgs/by-name/at/attract-mode/package.nix | 4 ++-- pkgs/by-name/cc/ccextractor/package.nix | 8 ++++---- pkgs/by-name/fe/febio-studio/package.nix | 4 ++-- pkgs/by-name/me/metadata/package.nix | 6 +++--- pkgs/by-name/mu/musly/package.nix | 4 ++-- pkgs/development/libraries/chromaprint/default.nix | 4 ++-- pkgs/development/libraries/mediastreamer/default.nix | 4 ++-- pkgs/development/libraries/pangolin/default.nix | 4 ++-- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 4 ++-- pkgs/development/libraries/qt-6/modules/qtmultimedia.nix | 4 ++-- pkgs/development/libraries/qt-6/modules/qtwebengine.nix | 4 ++-- pkgs/development/octave-modules/video/default.nix | 4 ++-- .../development/python-modules/ffmpeg-python/default.nix | 9 +++------ pkgs/games/hedgewars/default.nix | 4 ++-- pkgs/games/ultrastardx/default.nix | 4 ++-- pkgs/misc/screensavers/electricsheep/default.nix | 4 ++-- pkgs/os-specific/linux/guvcview/default.nix | 4 ++-- pkgs/servers/guacamole-server/default.nix | 4 ++-- pkgs/servers/misc/oven-media-engine/default.nix | 4 ++-- pkgs/servers/photoprism/default.nix | 4 ++-- pkgs/tools/audio/loudgain/default.nix | 4 ++-- pkgs/tools/graphics/vulkan-cts/default.nix | 4 ++-- pkgs/tools/video/untrunc-anthwlock/default.nix | 4 ++-- pkgs/tools/video/xjadeo/default.nix | 4 ++-- pkgs/tools/wayland/wl-screenrec/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 39 files changed, 82 insertions(+), 87 deletions(-) diff --git a/nixos/modules/services/video/go2rtc/default.nix b/nixos/modules/services/video/go2rtc/default.nix index 3121ce4737c7..f74c172907fe 100644 --- a/nixos/modules/services/video/go2rtc/default.nix +++ b/nixos/modules/services/video/go2rtc/default.nix @@ -55,8 +55,8 @@ in ffmpeg = { bin = mkOption { type = path; - default = lib.getExe pkgs.ffmpeg_7-headless; - defaultText = literalExpression "lib.getExe pkgs.ffmpeg_7-headless"; + default = lib.getExe pkgs.ffmpeg-headless; + defaultText = literalExpression "lib.getExe pkgs.ffmpeg-headless"; description = '' The ffmpeg package to use for transcoding. ''; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index bdedb3b9579b..281cd130b4ac 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -30,7 +30,7 @@ , libid3tag , libopus , libuuid -, ffmpeg_7 +, ffmpeg , soundtouch , pcre , portaudio # given up fighting their portaudio.patch? @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat - ffmpeg_7 + ffmpeg file flac gtk3 @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString stdenv.isLinux '' wrapProgram "$out/bin/audacity" \ "''${gappsWrapperArgs[@]}" \ - --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_7 ]} \ + --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg ]} \ --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ --suffix AUDACITY_PATH : "$out/share/audacity" '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 1a4ac86cc213..8c6e2692a640 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ffmpeg_7, libkeyfinder, fftw }: +{ lib, stdenv, fetchFromGitHub, ffmpeg, libkeyfinder, fftw }: stdenv.mkDerivation rec { pname = "keyfinder-cli"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA="; }; - buildInputs = [ ffmpeg_7 libkeyfinder fftw ]; + buildInputs = [ ffmpeg libkeyfinder fftw ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index a7ad6590aa6b..8e0554245c16 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -16,7 +16,7 @@ , musepackSupport ? true, libmpc, libmpcdec, taglib , vorbisSupport ? true, libvorbis , speexSupport ? true, speex -, ffmpegSupport ? true, ffmpeg_7 +, ffmpegSupport ? true, ffmpeg , sndfileSupport ? true, libsndfile , wavpackSupport ? true, wavpack # Misc @@ -74,7 +74,7 @@ stdenv.mkDerivation { ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ lib.optional vorbisSupport libvorbis ++ lib.optional speexSupport speex - ++ lib.optional ffmpegSupport ffmpeg_7 + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional sndfileSupport libsndfile ++ lib.optional wavpackSupport wavpack # Misc diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 11116c7ffa5f..b1a4825a88c8 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg_7, curl }: +{ fetchFromGitHub, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg, curl }: stdenv.mkDerivation rec { pname = "pianobar"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libao json_c libgcrypt ffmpeg_7 curl + libao json_c libgcrypt ffmpeg curl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 83cb0b2bbc63..547e9c84d4dd 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -8,7 +8,7 @@ , alsa-lib , dbus , fetchFromGitHub -, ffmpeg_7 +, ffmpeg , flac , freetype , gamemode @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { lib.optional (runtimeLibs != [ ]) makeWrapper; buildInputs = [ - ffmpeg_7 + ffmpeg flac freetype libGL diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 363114fdaafb..1b65e77b1a5c 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch2, copyDesktopItems, makeDesktopItem, qmake , qtbase, qtxmlpatterns, qttools, qtwebengine, libGL, fontconfig, openssl, poppler, wrapQtAppsHook -, ffmpeg_7, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg +, ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: let @@ -68,7 +68,7 @@ in stdenv.mkDerivation (finalAttrs: { fontconfig openssl poppler - ffmpeg_7 + ffmpeg libva alsa-lib SDL diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index 9b0da69d71fa..360da8ede775 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - ffmpeg_7, kio, taglib + ffmpeg, kio, taglib }: mkDerivation { @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ffmpeg_7 kio taglib ]; + buildInputs = [ ffmpeg kio taglib ]; } diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 4906b0b80c76..88127f6db4fc 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -1,4 +1,4 @@ -{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_7, fox_1_6, gdal, +{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal, git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg, libpng, libtiff, libxcrypt, openscenegraph , proj, python3, python3Packages, stdenv, swig, xercesc, xorg, zlib }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 eigen - ffmpeg_7 + ffmpeg fox_1_6 gdal gl2ps diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 7ec4658aee32..55c2c271980d 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -7,7 +7,7 @@ , docbook-xsl-nons , dvdauthor , dvdplusrwtools -, ffmpeg_7 +, ffmpeg , flex , fontconfig , gettext @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { cdrtools dvdauthor dvdplusrwtools - ffmpeg_7 + ffmpeg fontconfig glib libexif diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 1608585de795..58ed655f86a3 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_7 +{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg , aalibSupport ? true, aalib , fontconfigSupport ? true, fontconfig, freefont_ttf , fribidiSupport ? true, fribidi @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config yasm ]; - buildInputs = [ freetype ffmpeg_7 ] + buildInputs = [ freetype ffmpeg ] ++ lib.optional aalibSupport aalib ++ lib.optional fontconfigSupport fontconfig ++ lib.optional fribidiSupport fribidi diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 9b503abab6a1..d02c7cffaad3 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg_7, libjack2, libX11, libXext, libXinerama, qtx11extras +{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras , libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja, nix-update-script }: @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ - alsa-lib ffmpeg_7 libjack2 libX11 libXext libXfixes libXinerama libGLU libGL + alsa-lib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL libpulseaudio libv4l qtbase qttools qtx11extras ]; diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index 15f6313c4215..0118d6c09be0 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch2, pkg-config, libxcb, mkDerivation, cmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 -, ffmpeg_7, gst_all_1, libpulseaudio, alsa-lib, jack2 +, ffmpeg, gst_all_1, libpulseaudio, alsa-lib, jack2 , v4l-utils }: mkDerivation rec { pname = "webcamoid"; @@ -24,7 +24,7 @@ mkDerivation rec { buildInputs = [ libxcb qtbase qtdeclarative qtquickcontrols qtquickcontrols2 - ffmpeg_7 + ffmpeg gst_all_1.gstreamer gst_all_1.gst-plugins-base alsa-lib libpulseaudio jack2 v4l-utils diff --git a/pkgs/by-name/at/attract-mode/package.nix b/pkgs/by-name/at/attract-mode/package.nix index 87328a78ce6f..60968cfb85a0 100644 --- a/pkgs/by-name/at/attract-mode/package.nix +++ b/pkgs/by-name/at/attract-mode/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pkg-config, expat, - ffmpeg_7, + ffmpeg, freetype, libarchive, libjpeg, @@ -32,7 +32,7 @@ stdenv.mkDerivation { buildInputs = [ expat - ffmpeg_7 + ffmpeg freetype libarchive libjpeg diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix index 0ddfdfe3f3c8..293784acd422 100644 --- a/pkgs/by-name/cc/ccextractor/package.nix +++ b/pkgs/by-name/cc/ccextractor/package.nix @@ -18,7 +18,7 @@ zlib, utf8proc, freetype, - ffmpeg_7, + ffmpeg, libarchive, curl, libiconv, @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { zlib utf8proc freetype - ffmpeg_7 + ffmpeg libarchive curl libiconv @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { ]; env = { - FFMPEG_INCLUDE_DIR = "${lib.getDev ffmpeg_7}/include"; + FFMPEG_INCLUDE_DIR = "${lib.getDev ffmpeg}/include"; # Upstream’s FFmpeg binding crate needs an explicit path to a shared # object to do dynamic linking. The key word is *an* explicit path; @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { "swresample" "swscale" ]; - ffmpegLibDir = "${lib.getLib ffmpeg_7}/lib"; + ffmpegLibDir = "${lib.getLib ffmpeg}/lib"; ffmpegLibExt = stdenv.hostPlatform.extensions.library; ffmpegLibPath = ffmpegLibName: "${ffmpegLibDir}/lib${ffmpegLibName}.${ffmpegLibExt}"; ffmpegLinkerScript = writeTextFile { diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix index 654046067dc8..c37c7f3fe241 100644 --- a/pkgs/by-name/fe/febio-studio/package.nix +++ b/pkgs/by-name/fe/febio-studio/package.nix @@ -16,7 +16,7 @@ tetgenSupport ? true, tetgen, ffmpegSupport ? true, - ffmpeg_7, + ffmpeg, dicomSupport ? false, dcmtk, withModelRepo ? true, @@ -75,7 +75,7 @@ stdenv'.mkDerivation (finalAttrs: { libssh ] ++ lib.optional tetgenSupport tetgen - ++ lib.optional ffmpegSupport ffmpeg_7 + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional dicomSupport dcmtk; meta = { diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix index 23f20f53452c..03e8666009e4 100644 --- a/pkgs/by-name/me/metadata/package.nix +++ b/pkgs/by-name/me/metadata/package.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , pkg-config -, ffmpeg_7 +, ffmpeg , rustPlatform , glib , installShellFiles @@ -35,11 +35,11 @@ rustPlatform.buildRustPackage rec { ''; buildInputs = [ - ffmpeg_7 + ffmpeg glib ]; - env.FFMPEG_DIR = ffmpeg_7.dev; + env.FFMPEG_DIR = ffmpeg.dev; meta = { description = "Media metadata parser and formatter designed for human consumption, powered by FFmpeg"; diff --git a/pkgs/by-name/mu/musly/package.nix b/pkgs/by-name/mu/musly/package.nix index 25938c2059fa..07cb806a21f0 100644 --- a/pkgs/by-name/mu/musly/package.nix +++ b/pkgs/by-name/mu/musly/package.nix @@ -6,7 +6,7 @@ ninja, pkg-config, eigen, - ffmpeg_7, + ffmpeg, libresample, kissfft, }: @@ -47,7 +47,7 @@ stdenv.mkDerivation { buildInputs = [ eigen - ffmpeg_7 + ffmpeg libresample kissfft ]; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 934a4b04a96b..8169c208d0c9 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -5,7 +5,7 @@ , fetchpatch2 , cmake , ninja -, ffmpeg_7 +, ffmpeg , darwin , zlib }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ ffmpeg_7 ] ++ lib.optionals stdenv.isDarwin + buildInputs = [ ffmpeg ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]); cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index cdd1eb3bdbf7..03efb5d57a70 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -3,7 +3,7 @@ , cmake , fetchFromGitLab , fetchpatch2 -, ffmpeg_7 +, ffmpeg , glew , gsm , lib @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { bzrtp ortp - ffmpeg_7 + ffmpeg glew libX11 libXext diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 600c7b0eb058..3c20fe7bf497 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew -, xorg, ffmpeg_7, libjpeg, libpng, libtiff, eigen +, xorg, ffmpeg, libjpeg, libpng, libtiff, eigen , Carbon, Cocoa }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { libGL glew xorg.libX11 - ffmpeg_7 + ffmpeg libjpeg libpng libtiff diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 1a63c9508c05..5663ffb413b8 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -25,7 +25,7 @@ , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication , MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML, OpenDirectory, Accelerate , cups, openbsm, xcbuild, writeScriptBin -, ffmpeg_7 ? null +, ffmpeg ? null , lib, stdenv , version ? null , qtCompatVersion @@ -232,7 +232,7 @@ qtModule ({ harfbuzz icu libevent - ffmpeg_7 + ffmpeg ] ++ lib.optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 83bcb4c2a0d4..8cdabc32b657 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -13,7 +13,7 @@ , gst-plugins-good , gst-libav , gst-vaapi -, ffmpeg_7 +, ffmpeg , libva , libpulseaudio , wayland @@ -28,7 +28,7 @@ qtModule { pname = "qtmultimedia"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg_7 ] + buildInputs = [ ffmpeg ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ libunwind orc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib wayland libXrandr libva ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 8da3b7b62842..2cb57c80077a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -50,7 +50,7 @@ , systemd , pipewire , gn -, ffmpeg_7 +, ffmpeg , lib , stdenv , glib @@ -237,7 +237,7 @@ qtModule { lcms2 libevent - ffmpeg_7 + ffmpeg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus zlib diff --git a/pkgs/development/octave-modules/video/default.nix b/pkgs/development/octave-modules/video/default.nix index c95d78590cc0..798607fb34be 100644 --- a/pkgs/development/octave-modules/video/default.nix +++ b/pkgs/development/octave-modules/video/default.nix @@ -3,7 +3,7 @@ , lib , fetchFromGitHub , pkg-config -, ffmpeg_7 +, ffmpeg }: buildOctavePackage rec { @@ -22,7 +22,7 @@ buildOctavePackage rec { ]; propagatedBuildInputs = [ - ffmpeg_7 + ffmpeg ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index c337d64dc7ee..b7ae441c9f7e 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -2,12 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, fetchpatch2, setuptools, pytestCheckHook, pytest-mock, - ffmpeg_7, + ffmpeg, }: buildPythonPackage { @@ -23,10 +23,7 @@ buildPythonPackage { }; patches = [ - (substituteAll { - src = ./ffmpeg-location.patch; - ffmpeg = ffmpeg_7; - }) + (replaceVars ./ffmpeg-location.patch { inherit ffmpeg; }) # Remove dependency on `future` # https://github.com/kkroening/ffmpeg-python/pull/795 diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 351dd15c417f..76cebf4b2769 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, haskell, ffmpeg_7, libglut +{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, haskell, ffmpeg, libglut , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools, wrapQtAppsHook @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image_2_6 fpc lua5_1 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 - ffmpeg_7 libglut physfs + ffmpeg libglut physfs qtbase ] ++ lib.optional withServer ghc; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index bd07544712ad..ad0c894014e6 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -13,7 +13,7 @@ , SDL2_gfx , SDL2_mixer , SDL2_net, SDL2_ttf -, ffmpeg_7 +, ffmpeg , sqlite , zlib , libX11 @@ -25,7 +25,7 @@ let sharedLibs = [ pcre portaudio freetype SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf - sqlite lua zlib libX11 libGLU libGL ffmpeg_7 + sqlite lua zlib libX11 libGLU libGL ffmpeg ]; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index a75c725c0dbc..2f7038195b3e 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , wxGTK32 -, ffmpeg_7 +, ffmpeg , lua5_1 , curl , libpng @@ -34,7 +34,7 @@ stdenv.mkDerivation { buildInputs = [ wxGTK32 - ffmpeg_7 + ffmpeg lua5_1 curl libpng diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index e41f5c8e3c52..cc7353f087e6 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -5,7 +5,7 @@ , pkg-config , portaudio , SDL2 -, ffmpeg_7 +, ffmpeg , udev , libusb1 , libv4l @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsa-lib - ffmpeg_7 + ffmpeg libusb1 libv4l portaudio diff --git a/pkgs/servers/guacamole-server/default.nix b/pkgs/servers/guacamole-server/default.nix index 0a6fa5dd89a2..42bf481e252a 100644 --- a/pkgs/servers/guacamole-server/default.nix +++ b/pkgs/servers/guacamole-server/default.nix @@ -6,7 +6,7 @@ , autoPatchelfHook , autoreconfHook , cairo -, ffmpeg_7-headless +, ffmpeg-headless , freerdp , libjpeg_turbo , libpng @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo - ffmpeg_7-headless + ffmpeg-headless freerdp libjpeg_turbo libossp_uuid diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 20241ab89060..4d69b4b9e4dc 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -6,7 +6,7 @@ , perl , openssl , zlib -, ffmpeg_7 +, ffmpeg , libvpx , libopus , libuuid @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ bc pkg-config perl ]; - buildInputs = [ openssl srt zlib ffmpeg_7 libvpx libopus srtp jemalloc pcre2 libuuid hiredis ]; + buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid hiredis ]; preBuild = '' cd src diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/servers/photoprism/default.nix index 0c39ad8b6b81..85ba70c5027a 100644 --- a/pkgs/servers/photoprism/default.nix +++ b/pkgs/servers/photoprism/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg_7, libheif, exiftool, imagemagick, makeWrapper, testers +{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers , nixosTests , librsvg }: @@ -64,7 +64,7 @@ stdenv.mkDerivation { --set PHOTOPRISM_RAWTHERAPEE_BIN ${rawtherapee}/bin/rawtherapee-cli \ --set PHOTOPRISM_HEIFCONVERT_BIN ${libheif}/bin/heif-convert \ --set PHOTOPRISM_RSVGCONVERT_BIN ${librsvg}/bin/rsvg-convert \ - --set PHOTOPRISM_FFMPEG_BIN ${ffmpeg_7}/bin/ffmpeg \ + --set PHOTOPRISM_FFMPEG_BIN ${ffmpeg}/bin/ffmpeg \ --set PHOTOPRISM_EXIFTOOL_BIN ${exiftool}/bin/exiftool \ --set PHOTOPRISM_IMAGEMAGICK_BIN ${imagemagick}/bin/convert diff --git a/pkgs/tools/audio/loudgain/default.nix b/pkgs/tools/audio/loudgain/default.nix index 54c5c457b1d2..2794ba52e89e 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_7, libebur128 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg, libebur128 , libresample, taglib, zlib }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ffmpeg_7 libebur128 libresample taglib zlib ]; + buildInputs = [ ffmpeg 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 5b7356c3054e..885a17e7a694 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -3,7 +3,7 @@ , fetchurl , runCommand , cmake -, ffmpeg_7 +, ffmpeg , glslang , libdrm , libglvnd @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ''; buildInputs = [ - ffmpeg_7 + ffmpeg libdrm libffi libglvnd diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index 0bdbe29d3ee9..9598e9a7b15f 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_7, libui, unstableGitUpdater, wrapGAppsHook3 }: +{ lib, stdenv, fetchFromGitHub, ffmpeg, libui, unstableGitUpdater, wrapGAppsHook3 }: stdenv.mkDerivation { pname = "untrunc-anthwlock"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ wrapGAppsHook3 ]; - buildInputs = [ ffmpeg_7 libui ]; + buildInputs = [ ffmpeg libui ]; buildPhase = '' runHook preBuild diff --git a/pkgs/tools/video/xjadeo/default.nix b/pkgs/tools/video/xjadeo/default.nix index 3bda4a823038..7abb717f00cd 100644 --- a/pkgs/tools/video/xjadeo/default.nix +++ b/pkgs/tools/video/xjadeo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg_7, freetype, libGLU +{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg, 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_7 + ffmpeg libjack2 libX11 xorg.libXext diff --git a/pkgs/tools/wayland/wl-screenrec/default.nix b/pkgs/tools/wayland/wl-screenrec/default.nix index 2ffdbf95de1a..47fecd9850c8 100644 --- a/pkgs/tools/wayland/wl-screenrec/default.nix +++ b/pkgs/tools/wayland/wl-screenrec/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pkg-config , libdrm -, ffmpeg_7 +, ffmpeg , wayland }: @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ wayland libdrm - ffmpeg_7 + ffmpeg ]; doCheck = false; # tests use host compositor, etc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bb5a00bd770..347af5805ae9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5603,9 +5603,7 @@ with pkgs; medusa = callPackage ../tools/security/medusa { }; - megasync = libsForQt5.callPackage ../applications/misc/megasync { - ffmpeg = ffmpeg_7; - }; + megasync = libsForQt5.callPackage ../applications/misc/megasync { }; megacmd = callPackage ../applications/misc/megacmd { };