public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: ffmpeg_4 -> ffmpeg

Browse Source
This commit is contained in:
zowoq 2020-06-13 12:31:01 +10:00 committed by Jon
parent 0a63b5ae34
commit 78e324d272
13 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/pulseaudio-modules-bt/default.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, pulseaudio , pulseaudio
, pkgconfig , pkgconfig
, ffmpeg_4 , ffmpeg
, patchelf , patchelf
, fdk_aac , fdk_aac
, libtool , libtool
@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pulseaudio pulseaudio
ffmpeg_4 ffmpeg
fdk_aac fdk_aac
libtool libtool
ldacbt ldacbt
@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do
orig_rpath=$(patchelf --print-rpath "$so") orig_rpath=$(patchelf --print-rpath "$so")
patchelf \ patchelf \
--set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \
"$so" "$so"
done done
''; '';

4
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -2,7 +2,7 @@
## various stuff that can be plugged in ## various stuff that can be plugged in
, flashplayer, hal-flash , flashplayer, hal-flash
, ffmpeg_4, xorg, libpulseaudio, libcanberra-gtk2, libglvnd , ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
, gnome3/*.gnome-shell*/ , gnome3/*.gnome-shell*/
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
, tridactyl-native , tridactyl-native
@ -66,7 +66,7 @@ let
++ extraNativeMessagingHosts ++ extraNativeMessagingHosts
); );
libs = lib.optionals stdenv.isLinux [ udev libva ] libs = lib.optionals stdenv.isLinux [ udev libva ]
++ lib.optional ffmpegSupport ffmpeg_4 ++ lib.optional ffmpegSupport ffmpeg
++ lib.optional gssSupport kerberos ++ lib.optional gssSupport kerberos
++ lib.optional gdkWayland libglvnd ++ lib.optional gdkWayland libglvnd
++ lib.optionals (cfg.enableQuakeLive or false) ++ lib.optionals (cfg.enableQuakeLive or false)

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchurl, fetchsvn { mkDerivation, lib, fetchurl, fetchsvn
, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
, dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
, tl-expected, hunspell , tl-expected, hunspell
# TODO: Shouldn't be required: # TODO: Shouldn't be required:
, pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
@ -42,7 +42,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash
dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
tl-expected hunspell tl-expected hunspell
# TODO: Shouldn't be required: # TODO: Shouldn't be required:
pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst

4
pkgs/applications/networking/remote/waypipe/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab { stdenv, fetchFromGitLab
, meson, ninja, pkgconfig, scdoc , meson, ninja, pkgconfig, scdoc
, wayland, wayland-protocols, openssh , wayland, wayland-protocols, openssh
, mesa, lz4, zstd, ffmpeg_4, libva , mesa, lz4, zstd, ffmpeg, libva
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
wayland wayland-protocols wayland wayland-protocols
# Optional dependencies: # Optional dependencies:
mesa lz4 zstd ffmpeg_4 libva mesa lz4 zstd ffmpeg libva
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/applications/video/mpv/default.nix
View File

@ -1,6 +1,6 @@
{ config, stdenv, fetchurl, fetchFromGitHub, fetchpatch { config, stdenv, fetchurl, fetchFromGitHub, fetchpatch
, addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which
, ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs , ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs
, nv-codec-headers, lua, libuchardet, libiconv ? null , nv-codec-headers, lua, libuchardet, libiconv ? null
, CoreFoundation, Cocoa, CoreAudio, MediaPlayer , CoreFoundation, Cocoa, CoreAudio, MediaPlayer
@ -155,7 +155,7 @@ in stdenv.mkDerivation rec {
++ optional swiftSupport swift; ++ optional swiftSupport swift;
buildInputs = [ buildInputs = [
ffmpeg_4 freetype libass libpthreadstubs ffmpeg freetype libass libpthreadstubs
luaEnv libuchardet mujs luaEnv libuchardet mujs
] ++ optional alsaSupport alsaLib ] ++ optional alsaSupport alsaLib
++ optional archiveSupport libarchive ++ optional archiveSupport libarchive

4
pkgs/applications/video/wf-recorder/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc { stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc
, wayland-protocols, ffmpeg_4, x264, libpulseaudio, ocl-icd, opencl-headers , wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ];
buildInputs = [ buildInputs = [
wayland-protocols ffmpeg_4 x264 libpulseaudio ocl-icd opencl-headers wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/development/libraries/wlroots/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland { stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
, libGL, wayland-protocols, libinput, libxkbcommon, pixman , libGL, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
, libpng, ffmpeg_4 , libpng, ffmpeg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libGL wayland-protocols libinput libxkbcommon pixman libGL wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
libpng ffmpeg_4 libpng ffmpeg
]; ];
postInstall = '' postInstall = ''

4
pkgs/development/python-modules/av/default.nix
View File

@ -2,7 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, numpy , numpy
, ffmpeg_4 , ffmpeg
, pkgconfig , pkgconfig
}: }:
@ -18,7 +18,7 @@ buildPythonPackage rec {
checkInputs = [ numpy ]; checkInputs = [ numpy ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ffmpeg_4 ]; buildInputs = [ ffmpeg ];
# Tests require downloading files from internet # Tests require downloading files from internet
doCheck = false; doCheck = false;

2
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
View File

@ -24,7 +24,7 @@ self: super:
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.pkgconfig pkgs.pkgconfig
]; ];
buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; buildInputs = old.buildInputs ++ [ pkgs.ffmpeg ];
} }
); );

4
pkgs/tools/X11/xpra/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText { stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText
, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
, ffmpeg_4, x264, libvpx, libwebp, x265 , ffmpeg, x264, libvpx, libwebp, x265
, libfakeXinerama , libfakeXinerama
, gst_all_1, pulseaudio, gobject-introspection , gst_all_1, pulseaudio, gobject-introspection
, pam }: , pam }:
@ -60,7 +60,7 @@ in buildPythonApplication rec {
pango cairo gdk-pixbuf atk.out gtk3 glib pango cairo gdk-pixbuf atk.out gtk3 glib
ffmpeg_4 libvpx x264 libwebp x265 ffmpeg libvpx x264 libwebp x265
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base

4
pkgs/tools/misc/diffoscope/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, runCommand, makeWrapper, python3Packages, docutils, help2man { lib, stdenv, fetchurl, fetchpatch, runCommand, makeWrapper, python3Packages, docutils, help2man
, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg_4, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R
, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd , sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd
, enableBloat ? false , enableBloat ? false
@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec {
]) ])
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ] ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ]
++ lib.optionals enableBloat ([ ++ lib.optionals enableBloat ([
abootimg apksigner apktool cbfstool colord ffmpeg_4 fpc ghc ghostscriptX giflib gnupg gnumeric abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt
] ++ (with python3Packages; [ binwalk guestfs h5py ])); ] ++ (with python3Packages; [ binwalk guestfs h5py ]));

4
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchurl, buildPythonPackage { lib, fetchurl, buildPythonPackage
, zip, ffmpeg_4, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
# Pandoc is required to build the package's man page. Release tarballs contain a # Pandoc is required to build the package's man page. Release tarballs contain a
# formatted man page already, though, it will still be installed. We keep the # formatted man page already, though, it will still be installed. We keep the
# manpage argument in place in case someone wants to use this derivation to # manpage argument in place in case someone wants to use this derivation to
@ -36,7 +36,7 @@ buildPythonPackage rec {
makeWrapperArgs = let makeWrapperArgs = let
packagesToBinPath = packagesToBinPath =
[ atomicparsley ] [ atomicparsley ]
++ lib.optional ffmpegSupport ffmpeg_4 ++ lib.optional ffmpegSupport ffmpeg
++ lib.optional rtmpSupport rtmpdump ++ lib.optional rtmpSupport rtmpdump
++ lib.optional phantomjsSupport phantomjs2; ++ lib.optional phantomjsSupport phantomjs2;
in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ];

20
pkgs/top-level/all-packages.nix
View File

@ -1968,7 +1968,7 @@ in
interlock = callPackage ../servers/interlock {}; interlock = callPackage ../servers/interlock {};
jellyfin = callPackage ../servers/jellyfin { ffmpeg = ffmpeg_4; }; jellyfin = callPackage ../servers/jellyfin { };
jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
@ -11719,8 +11719,6 @@ in
ffmpeg = ffmpeg_4; ffmpeg = ffmpeg_4;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
ffmpeg = ffmpeg_4;
# The following need to be fixed on Darwin # The following need to be fixed on Darwin
frei0r = if stdenv.isDarwin then null else frei0r; frei0r = if stdenv.isDarwin then null else frei0r;
game-music-emu = if stdenv.isDarwin then null else game-music-emu; game-music-emu = if stdenv.isDarwin then null else game-music-emu;
@ -12077,7 +12075,7 @@ in
gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { };
gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
callPackage = newScope { libav = pkgs.ffmpeg_4; }; callPackage = newScope { libav = pkgs.ffmpeg; };
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
}); });
@ -13811,7 +13809,7 @@ in
withGUI = false; withGUI = false;
}; };
mlt = callPackage ../development/libraries/mlt { ffmpeg = ffmpeg_4; }; mlt = callPackage ../development/libraries/mlt { };
mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { }; mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { };
@ -14367,9 +14365,7 @@ in
kpmcore = callPackage ../development/libraries/kpmcore { }; kpmcore = callPackage ../development/libraries/kpmcore { };
mlt = callPackage ../development/libraries/mlt/qt-5.nix { mlt = callPackage ../development/libraries/mlt/qt-5.nix { };
ffmpeg = ffmpeg_4;
};
openbr = callPackage ../development/libraries/openbr { }; openbr = callPackage ../development/libraries/openbr { };
@ -18871,7 +18867,6 @@ in
bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bibletime = libsForQt5.callPackage ../applications/misc/bibletime { };
bino3d = libsForQt5.callPackage ../applications/video/bino3d { bino3d = libsForQt5.callPackage ../applications/video/bino3d {
ffmpeg = ffmpeg_4;
glew = glew110; glew = glew110;
}; };
@ -21382,7 +21377,7 @@ in
obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { };
obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { ffmpeg = ffmpeg_4; }; obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { };
obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };
@ -23663,7 +23658,6 @@ in
inherit (plasma5) oxygen; inherit (plasma5) oxygen;
inherit (kdeApplications) akonadi-contacts; inherit (kdeApplications) akonadi-contacts;
inherit (kdeFrameworks) kcalendarcore; inherit (kdeFrameworks) kcalendarcore;
ffmpeg = ffmpeg_4;
opencv3 = opencv3WithoutCuda; opencv3 = opencv3WithoutCuda;
}; };
@ -26370,9 +26364,7 @@ in
vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; vazir-fonts = callPackage ../data/fonts/vazir-fonts { };
vbam = callPackage ../misc/emulators/vbam { vbam = callPackage ../misc/emulators/vbam { };
ffmpeg = ffmpeg_4;
};
vice = callPackage ../misc/emulators/vice { vice = callPackage ../misc/emulators/vice {
giflib = giflib_4_1; giflib = giflib_4_1;