movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

treewide: optimistically unpin FFmpeg 7 dependencies

Browse source 
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.
This commit is contained in:
Emily 2024-08-27 22:52:44 +01:00
parent 342fb8a152
commit 61922738bb
39 changed files with 82 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/video/go2rtc/default.nix
View file

@ -55,8 +55,8 @@ in
ffmpeg = { ffmpeg = {
bin = mkOption { bin = mkOption {
type = path; type = path;
default = lib.getExe pkgs.ffmpeg_7-headless; default = lib.getExe pkgs.ffmpeg-headless;
defaultText = literalExpression "lib.getExe pkgs.ffmpeg_7-headless"; defaultText = literalExpression "lib.getExe pkgs.ffmpeg-headless";
description = '' description = ''
The ffmpeg package to use for transcoding. The ffmpeg package to use for transcoding.
''; '';

6
pkgs/applications/audio/audacity/default.nix
View file

@ -30,7 +30,7 @@
, libid3tag , libid3tag
, libopus , libopus
, libuuid , libuuid
, ffmpeg_7 , ffmpeg
, soundtouch , soundtouch
, pcre , pcre
, portaudio # given up fighting their portaudio.patch? , portaudio # given up fighting their portaudio.patch?
@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
expat expat
ffmpeg_7 ffmpeg
file file
flac flac
gtk3 gtk3
@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
postFixup = lib.optionalString stdenv.isLinux '' postFixup = lib.optionalString stdenv.isLinux ''
wrapProgram "$out/bin/audacity" \ wrapProgram "$out/bin/audacity" \
"''${gappsWrapperArgs[@]}" \ "''${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_MODULES_PATH : "$out/lib/audacity/modules" \
--suffix AUDACITY_PATH : "$out/share/audacity" --suffix AUDACITY_PATH : "$out/share/audacity"
'' + lib.optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''

4
pkgs/applications/audio/keyfinder-cli/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ffmpeg_7, libkeyfinder, fftw }: { lib, stdenv, fetchFromGitHub, ffmpeg, libkeyfinder, fftw }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "keyfinder-cli"; pname = "keyfinder-cli";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA="; hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA=";
}; };
buildInputs = [ ffmpeg_7 libkeyfinder fftw ]; buildInputs = [ ffmpeg libkeyfinder fftw ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

4
pkgs/applications/audio/moc/default.nix
View file

@ -16,7 +16,7 @@
, musepackSupport ? true, libmpc, libmpcdec, taglib , musepackSupport ? true, libmpc, libmpcdec, taglib
, vorbisSupport ? true, libvorbis , vorbisSupport ? true, libvorbis
, speexSupport ? true, speex , speexSupport ? true, speex
, ffmpegSupport ? true, ffmpeg_7 , ffmpegSupport ? true, ffmpeg
, sndfileSupport ? true, libsndfile , sndfileSupport ? true, libsndfile
, wavpackSupport ? true, wavpack , wavpackSupport ? true, wavpack
# Misc # Misc
@ -74,7 +74,7 @@ stdenv.mkDerivation {
++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ]
++ lib.optional vorbisSupport libvorbis ++ lib.optional vorbisSupport libvorbis
++ lib.optional speexSupport speex ++ lib.optional speexSupport speex
++ lib.optional ffmpegSupport ffmpeg_7 ++ lib.optional ffmpegSupport ffmpeg
++ lib.optional sndfileSupport libsndfile ++ lib.optional sndfileSupport libsndfile
++ lib.optional wavpackSupport wavpack ++ lib.optional wavpackSupport wavpack
# Misc # Misc

4
pkgs/applications/audio/pianobar/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
pname = "pianobar"; pname = "pianobar";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
libao json_c libgcrypt ffmpeg_7 curl libao json_c libgcrypt ffmpeg curl
]; ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

4
pkgs/applications/emulators/retroarch/default.nix
View file

@ -8,7 +8,7 @@
, alsa-lib , alsa-lib
, dbus , dbus
, fetchFromGitHub , fetchFromGitHub
, ffmpeg_7 , ffmpeg
, flac , flac
, freetype , freetype
, gamemode , gamemode
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
lib.optional (runtimeLibs != [ ]) makeWrapper; lib.optional (runtimeLibs != [ ]) makeWrapper;
buildInputs = [ buildInputs = [
ffmpeg_7 ffmpeg
flac flac
freetype freetype
libGL libGL

4
pkgs/applications/graphics/openboard/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch2, copyDesktopItems, makeDesktopItem, qmake { stdenv, lib, fetchFromGitHub, fetchpatch2, copyDesktopItems, makeDesktopItem, qmake
, qtbase, qtxmlpatterns, qttools, qtwebengine, libGL, fontconfig, openssl, poppler, wrapQtAppsHook , 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 }: , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }:
let let
@ -68,7 +68,7 @@ in stdenv.mkDerivation (finalAttrs: {
fontconfig fontconfig
openssl openssl
poppler poppler
ffmpeg_7 ffmpeg
libva libva
alsa-lib alsa-lib
SDL SDL

4
pkgs/applications/kde/ffmpegthumbs.nix
View file

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, mkDerivation, lib,
extra-cmake-modules, extra-cmake-modules,
ffmpeg_7, kio, taglib ffmpeg, kio, taglib
}: }:
mkDerivation { mkDerivation {
@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ffmpeg_7 kio taglib ]; buildInputs = [ ffmpeg kio taglib ];
} }

4
pkgs/applications/science/networking/sumo/default.nix
View file

@ -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, git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg,
libpng, libtiff, libxcrypt, openscenegraph , proj, python3, libpng, libtiff, libxcrypt, openscenegraph , proj, python3,
python3Packages, stdenv, swig, xercesc, xorg, zlib }: python3Packages, stdenv, swig, xercesc, xorg, zlib }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bzip2 bzip2
eigen eigen
ffmpeg_7 ffmpeg
fox_1_6 fox_1_6
gdal gdal
gl2ps gl2ps

4
pkgs/applications/video/dvdstyler/default.nix
View file

@ -7,7 +7,7 @@
, docbook-xsl-nons , docbook-xsl-nons
, dvdauthor , dvdauthor
, dvdplusrwtools , dvdplusrwtools
, ffmpeg_7 , ffmpeg
, flex , flex
, fontconfig , fontconfig
, gettext , gettext
@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
cdrtools cdrtools
dvdauthor dvdauthor
dvdplusrwtools dvdplusrwtools
ffmpeg_7 ffmpeg
fontconfig fontconfig
glib glib
libexif libexif

4
pkgs/applications/video/mplayer/default.nix
View file

@ -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 , aalibSupport ? true, aalib
, fontconfigSupport ? true, fontconfig, freefont_ttf , fontconfigSupport ? true, fontconfig, freefont_ttf
, fribidiSupport ? true, fribidi , fribidiSupport ? true, fribidi
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config yasm ]; nativeBuildInputs = [ pkg-config yasm ];
buildInputs = [ freetype ffmpeg_7 ] buildInputs = [ freetype ffmpeg ]
++ lib.optional aalibSupport aalib ++ lib.optional aalibSupport aalib
++ lib.optional fontconfigSupport fontconfig ++ lib.optional fontconfigSupport fontconfig
++ lib.optional fribidiSupport fribidi ++ lib.optional fribidiSupport fribidi

4
pkgs/applications/video/simplescreenrecorder/default.nix
View file

@ -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 , 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 ]; nativeBuildInputs = [ pkg-config cmake ninja ];
buildInputs = [ 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 libpulseaudio libv4l qtbase qttools qtx11extras
]; ];

4
pkgs/applications/video/webcamoid/default.nix
View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, fetchpatch2, pkg-config, libxcb, mkDerivation, cmake { lib, fetchFromGitHub, fetchpatch2, pkg-config, libxcb, mkDerivation, cmake
, qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2
, ffmpeg_7, gst_all_1, libpulseaudio, alsa-lib, jack2 , ffmpeg, gst_all_1, libpulseaudio, alsa-lib, jack2
, v4l-utils }: , v4l-utils }:
mkDerivation rec { mkDerivation rec {
pname = "webcamoid"; pname = "webcamoid";
@ -24,7 +24,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
libxcb libxcb
qtbase qtdeclarative qtquickcontrols qtquickcontrols2 qtbase qtdeclarative qtquickcontrols qtquickcontrols2
ffmpeg_7 ffmpeg
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gstreamer gst_all_1.gst-plugins-base
alsa-lib libpulseaudio jack2 alsa-lib libpulseaudio jack2
v4l-utils v4l-utils

4
pkgs/by-name/at/attract-mode/package.nix
View file

@ -4,7 +4,7 @@
fetchFromGitHub, fetchFromGitHub,
pkg-config, pkg-config,
expat, expat,
ffmpeg_7, ffmpeg,
freetype, freetype,
libarchive, libarchive,
libjpeg, libjpeg,
@ -32,7 +32,7 @@ stdenv.mkDerivation {
buildInputs = buildInputs =
[ [
expat expat
ffmpeg_7 ffmpeg
freetype freetype
libarchive libarchive
libjpeg libjpeg

8
pkgs/by-name/cc/ccextractor/package.nix
View file

@ -18,7 +18,7 @@
zlib, zlib,
utf8proc, utf8proc,
freetype, freetype,
ffmpeg_7, ffmpeg,
libarchive, libarchive,
curl, curl,
libiconv, libiconv,
@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
zlib zlib
utf8proc utf8proc
freetype freetype
ffmpeg_7 ffmpeg
libarchive libarchive
curl curl
libiconv libiconv
@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
env = { 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 # Upstream’s FFmpeg binding crate needs an explicit path to a shared
# object to do dynamic linking. The key word is *an* explicit path; # object to do dynamic linking. The key word is *an* explicit path;
@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
"swresample" "swresample"
"swscale" "swscale"
]; ];
ffmpegLibDir = "${lib.getLib ffmpeg_7}/lib"; ffmpegLibDir = "${lib.getLib ffmpeg}/lib";
ffmpegLibExt = stdenv.hostPlatform.extensions.library; ffmpegLibExt = stdenv.hostPlatform.extensions.library;
ffmpegLibPath = ffmpegLibName: "${ffmpegLibDir}/lib${ffmpegLibName}.${ffmpegLibExt}"; ffmpegLibPath = ffmpegLibName: "${ffmpegLibDir}/lib${ffmpegLibName}.${ffmpegLibExt}";
ffmpegLinkerScript = writeTextFile { ffmpegLinkerScript = writeTextFile {

4
pkgs/by-name/fe/febio-studio/package.nix
View file

@ -16,7 +16,7 @@
tetgenSupport ? true, tetgenSupport ? true,
tetgen, tetgen,
ffmpegSupport ? true, ffmpegSupport ? true,
ffmpeg_7, ffmpeg,
dicomSupport ? false, dicomSupport ? false,
dcmtk, dcmtk,
withModelRepo ? true, withModelRepo ? true,
@ -75,7 +75,7 @@ stdenv'.mkDerivation (finalAttrs: {
libssh libssh
] ]
++ lib.optional tetgenSupport tetgen ++ lib.optional tetgenSupport tetgen
++ lib.optional ffmpegSupport ffmpeg_7 ++ lib.optional ffmpegSupport ffmpeg
++ lib.optional dicomSupport dcmtk; ++ lib.optional dicomSupport dcmtk;
meta = { meta = {

6
pkgs/by-name/me/metadata/package.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, ffmpeg_7 , ffmpeg
, rustPlatform , rustPlatform
, glib , glib
, installShellFiles , installShellFiles
@ -35,11 +35,11 @@ rustPlatform.buildRustPackage rec {
''; '';
buildInputs = [ buildInputs = [
ffmpeg_7 ffmpeg
glib glib
]; ];
env.FFMPEG_DIR = ffmpeg_7.dev; env.FFMPEG_DIR = ffmpeg.dev;
meta = { meta = {
description = "Media metadata parser and formatter designed for human consumption, powered by FFmpeg"; description = "Media metadata parser and formatter designed for human consumption, powered by FFmpeg";

4
pkgs/by-name/mu/musly/package.nix
View file

@ -6,7 +6,7 @@
ninja, ninja,
pkg-config, pkg-config,
eigen, eigen,
ffmpeg_7, ffmpeg,
libresample, libresample,
kissfft, kissfft,
}: }:
@ -47,7 +47,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
eigen eigen
ffmpeg_7 ffmpeg
libresample libresample
kissfft kissfft
]; ];

4
pkgs/development/libraries/chromaprint/default.nix
View file

@ -5,7 +5,7 @@
, fetchpatch2 , fetchpatch2
, cmake , cmake
, ninja , ninja
, ffmpeg_7 , ffmpeg
, darwin , darwin
, zlib , zlib
}: }:
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja ]; 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 ]); (with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]);
cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ];

4
pkgs/development/libraries/mediastreamer/default.nix
View file

@ -3,7 +3,7 @@
, cmake , cmake
, fetchFromGitLab , fetchFromGitLab
, fetchpatch2 , fetchpatch2
, ffmpeg_7 , ffmpeg
, glew , glew
, gsm , gsm
, lib , lib
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
bzrtp bzrtp
ortp ortp
ffmpeg_7 ffmpeg
glew glew
libX11 libX11
libXext libXext

4
pkgs/development/libraries/pangolin/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew
, xorg, ffmpeg_7, libjpeg, libpng, libtiff, eigen , xorg, ffmpeg, libjpeg, libpng, libtiff, eigen
, Carbon, Cocoa , Carbon, Cocoa
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
libGL libGL
glew glew
xorg.libX11 xorg.libX11
ffmpeg_7 ffmpeg
libjpeg libjpeg
libpng libpng
libtiff libtiff

4
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View file

@ -25,7 +25,7 @@
, ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication
, MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML, OpenDirectory, Accelerate , MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML, OpenDirectory, Accelerate
, cups, openbsm, xcbuild, writeScriptBin , cups, openbsm, xcbuild, writeScriptBin
, ffmpeg_7 ? null , ffmpeg ? null
, lib, stdenv , lib, stdenv
, version ? null , version ? null
, qtCompatVersion , qtCompatVersion
@ -232,7 +232,7 @@ qtModule ({
harfbuzz icu harfbuzz icu
libevent libevent
ffmpeg_7 ffmpeg
] ++ lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals (!stdenv.isDarwin) [
dbus zlib minizip snappy nss protobuf jsoncpp dbus zlib minizip snappy nss protobuf jsoncpp

4
pkgs/development/libraries/qt-6/modules/qtmultimedia.nix
View file

@ -13,7 +13,7 @@
, gst-plugins-good , gst-plugins-good
, gst-libav , gst-libav
, gst-vaapi , gst-vaapi
, ffmpeg_7 , ffmpeg
, libva , libva
, libpulseaudio , libpulseaudio
, wayland , wayland
@ -28,7 +28,7 @@
qtModule { qtModule {
pname = "qtmultimedia"; pname = "qtmultimedia";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ ffmpeg_7 ] buildInputs = [ ffmpeg ]
++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ libunwind orc ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ libunwind orc ]
++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib wayland libXrandr libva ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib wayland libXrandr libva ]
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ]; ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ];

4
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
View file

@ -50,7 +50,7 @@
, systemd , systemd
, pipewire , pipewire
, gn , gn
, ffmpeg_7 , ffmpeg
, lib , lib
, stdenv , stdenv
, glib , glib
@ -237,7 +237,7 @@ qtModule {
lcms2 lcms2
libevent libevent
ffmpeg_7 ffmpeg
] ++ lib.optionals stdenv.hostPlatform.isLinux [ ] ++ lib.optionals stdenv.hostPlatform.isLinux [
dbus dbus
zlib zlib

4
pkgs/development/octave-modules/video/default.nix
View file

@ -3,7 +3,7 @@
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, ffmpeg_7 , ffmpeg
}: }:
buildOctavePackage rec { buildOctavePackage rec {
@ -22,7 +22,7 @@ buildOctavePackage rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
ffmpeg_7 ffmpeg
]; ];
meta = with lib; { meta = with lib; {

9
pkgs/development/python-modules/ffmpeg-python/default.nix
View file

@ -2,12 +2,12 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
substituteAll, replaceVars,
fetchpatch2, fetchpatch2,
setuptools, setuptools,
pytestCheckHook, pytestCheckHook,
pytest-mock, pytest-mock,
ffmpeg_7, ffmpeg,
}: }:
buildPythonPackage { buildPythonPackage {
@ -23,10 +23,7 @@ buildPythonPackage {
}; };
patches = [ patches = [
(substituteAll { (replaceVars ./ffmpeg-location.patch { inherit ffmpeg; })
src = ./ffmpeg-location.patch;
ffmpeg = ffmpeg_7;
})
# Remove dependency on `future` # Remove dependency on `future`
# https://github.com/kkroening/ffmpeg-python/pull/795 # https://github.com/kkroening/ffmpeg-python/pull/795

4
pkgs/games/hedgewars/default.nix
View file

@ -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 , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, libGL, libGLU, physfs , zlib, libpng, libGL, libGLU, physfs
, qtbase, qttools, wrapQtAppsHook , qtbase, qttools, wrapQtAppsHook
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image_2_6 SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image_2_6
fpc lua5_1 fpc lua5_1
llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64
ffmpeg_7 libglut physfs ffmpeg libglut physfs
qtbase qtbase
] ++ lib.optional withServer ghc; ] ++ lib.optional withServer ghc;

4
pkgs/games/ultrastardx/default.nix
View file

@ -13,7 +13,7 @@
, SDL2_gfx , SDL2_gfx
, SDL2_mixer , SDL2_mixer
, SDL2_net, SDL2_ttf , SDL2_net, SDL2_ttf
, ffmpeg_7 , ffmpeg
, sqlite , sqlite
, zlib , zlib
, libX11 , libX11
@ -25,7 +25,7 @@ let
sharedLibs = [ sharedLibs = [
pcre portaudio freetype pcre portaudio freetype
SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf 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 { in stdenv.mkDerivation rec {

4
pkgs/misc/screensavers/electricsheep/default.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, autoreconfHook , autoreconfHook
, wxGTK32 , wxGTK32
, ffmpeg_7 , ffmpeg
, lua5_1 , lua5_1
, curl , curl
, libpng , libpng
@ -34,7 +34,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
wxGTK32 wxGTK32
ffmpeg_7 ffmpeg
lua5_1 lua5_1
curl curl
libpng libpng

4
pkgs/os-specific/linux/guvcview/default.nix
View file

@ -5,7 +5,7 @@
, pkg-config , pkg-config
, portaudio , portaudio
, SDL2 , SDL2
, ffmpeg_7 , ffmpeg
, udev , udev
, libusb1 , libusb1
, libv4l , libv4l
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
SDL2 SDL2
alsa-lib alsa-lib
ffmpeg_7 ffmpeg
libusb1 libusb1
libv4l libv4l
portaudio portaudio

4
pkgs/servers/guacamole-server/default.nix
View file

@ -6,7 +6,7 @@
, autoPatchelfHook , autoPatchelfHook
, autoreconfHook , autoreconfHook
, cairo , cairo
, ffmpeg_7-headless , ffmpeg-headless
, freerdp , freerdp
, libjpeg_turbo , libjpeg_turbo
, libpng , libpng
@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
cairo cairo
ffmpeg_7-headless ffmpeg-headless
freerdp freerdp
libjpeg_turbo libjpeg_turbo
libossp_uuid libossp_uuid

4
pkgs/servers/misc/oven-media-engine/default.nix
View file

@ -6,7 +6,7 @@
, perl , perl
, openssl , openssl
, zlib , zlib
, ffmpeg_7 , ffmpeg
, libvpx , libvpx
, libopus , libopus
, libuuid , libuuid
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ bc pkg-config perl ]; 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 = '' preBuild = ''
cd src cd src

4
pkgs/servers/photoprism/default.nix
View file

@ -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 , nixosTests
, librsvg }: , librsvg }:
@ -64,7 +64,7 @@ stdenv.mkDerivation {
--set PHOTOPRISM_RAWTHERAPEE_BIN ${rawtherapee}/bin/rawtherapee-cli \ --set PHOTOPRISM_RAWTHERAPEE_BIN ${rawtherapee}/bin/rawtherapee-cli \
--set PHOTOPRISM_HEIFCONVERT_BIN ${libheif}/bin/heif-convert \ --set PHOTOPRISM_HEIFCONVERT_BIN ${libheif}/bin/heif-convert \
--set PHOTOPRISM_RSVGCONVERT_BIN ${librsvg}/bin/rsvg-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_EXIFTOOL_BIN ${exiftool}/bin/exiftool \
--set PHOTOPRISM_IMAGEMAGICK_BIN ${imagemagick}/bin/convert --set PHOTOPRISM_IMAGEMAGICK_BIN ${imagemagick}/bin/convert

4
pkgs/tools/audio/loudgain/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg_7, libebur128 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg, libebur128
, libresample, taglib, zlib }: , libresample, taglib, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ ffmpeg_7 libebur128 libresample taglib zlib ]; buildInputs = [ ffmpeg libebur128 libresample taglib zlib ];
postInstall = '' postInstall = ''
sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm" sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm"

4
pkgs/tools/graphics/vulkan-cts/default.nix
View file

@ -3,7 +3,7 @@
, fetchurl , fetchurl
, runCommand , runCommand
, cmake , cmake
, ffmpeg_7 , ffmpeg
, glslang , glslang
, libdrm , libdrm
, libglvnd , libglvnd
@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
buildInputs = [ buildInputs = [
ffmpeg_7 ffmpeg
libdrm libdrm
libffi libffi
libglvnd libglvnd

4
pkgs/tools/video/untrunc-anthwlock/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ffmpeg_7, libui, unstableGitUpdater, wrapGAppsHook3 }: { lib, stdenv, fetchFromGitHub, ffmpeg, libui, unstableGitUpdater, wrapGAppsHook3 }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "untrunc-anthwlock"; pname = "untrunc-anthwlock";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ wrapGAppsHook3 ]; nativeBuildInputs = [ wrapGAppsHook3 ];
buildInputs = [ ffmpeg_7 libui ]; buildInputs = [ ffmpeg libui ];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild

4
pkgs/tools/video/xjadeo/default.nix
View file

@ -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 }: , libjack2, liblo, libX11, libXv, pkg-config, portmidi, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ buildInputs = [
ffmpeg_7 ffmpeg
libjack2 libjack2
libX11 libX11
xorg.libXext xorg.libXext

4
pkgs/tools/wayland/wl-screenrec/default.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, libdrm , libdrm
, ffmpeg_7 , ffmpeg
, wayland , wayland
}: }:
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ buildInputs = [
wayland wayland
libdrm libdrm
ffmpeg_7 ffmpeg
]; ];
doCheck = false; # tests use host compositor, etc doCheck = false; # tests use host compositor, etc

4
pkgs/top-level/all-packages.nix
View file

@ -5603,9 +5603,7 @@ with pkgs;
medusa = callPackage ../tools/security/medusa { }; medusa = callPackage ../tools/security/medusa { };
megasync = libsForQt5.callPackage ../applications/misc/megasync { megasync = libsForQt5.callPackage ../applications/misc/megasync { };
ffmpeg = ffmpeg_7;
};
megacmd = callPackage ../applications/misc/megacmd { }; megacmd = callPackage ../applications/misc/megacmd { };