git.iko.soy/typeable/nixpkgs
on master help sign in
treewide: ffmpeg_4 -> ffmpeg
commit78e324d2726127828a15f87a75b4d3199a8955ec authorzowoq <59103226+zowoq@users.noreply.github.com> dateSat 13 Jun 2020, 12:31 (6 years ago) parent0a63b5a
13 files changed+30−38
pkgs/applications/audio/pulseaudio-modules-bt/default.nix+3−3 pkgs/applications/networking/browsers/firefox/wrapper.nix+2−2 pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+2−2 pkgs/applications/networking/remote/waypipe/default.nix+2−2 pkgs/applications/video/mpv/default.nix+2−2 pkgs/applications/video/wf-recorder/default.nix+2−2 pkgs/development/libraries/wlroots/default.nix+2−2 pkgs/development/python-modules/av/default.nix+2−2 pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix+1−1 pkgs/tools/X11/xpra/default.nix+2−2 pkgs/tools/misc/diffoscope/default.nix+2−2 pkgs/tools/misc/youtube-dl/default.nix+2−2 pkgs/top-level/all-packages.nix+6−14
pkgs/applications/audio/pulseaudio-modules-bt/default.nix+3−3
@@ -3,7 +3,7 @@
33, fetchFromGitHub
44, pulseaudio
55, pkgconfig
6−, ffmpeg_4
6+, ffmpeg
77, patchelf
88, fdk_aac
99, libtool
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
4545
4646 buildInputs = [
4747 pulseaudio
48− ffmpeg_4
48+ ffmpeg
4949 fdk_aac
5050 libtool
5151 ldacbt
@@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
7272 for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do
7373 orig_rpath=$(patchelf --print-rpath "$so")
7474 patchelf \
75− --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \
75+ --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \
7676 "$so"
7777 done
7878 '';
pkgs/applications/networking/browsers/firefox/wrapper.nix+2−2
@@ -2,7 +2,7 @@
22
33## various stuff that can be plugged in
44, flashplayer, hal-flash
5−, ffmpeg_4, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
5+, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
66, gnome3/*.gnome-shell*/
77, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
88, tridactyl-native
@@ -66,7 +66,7 @@ let
6666 ++ extraNativeMessagingHosts
6767 );
6868 libs = lib.optionals stdenv.isLinux [ udev libva ]
69− ++ lib.optional ffmpegSupport ffmpeg_4
69+ ++ lib.optional ffmpegSupport ffmpeg
7070 ++ lib.optional gssSupport kerberos
7171 ++ lib.optional gdkWayland libglvnd
7272 ++ lib.optionals (cfg.enableQuakeLive or false)
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+2−2
@@ -1,7 +1,7 @@
11{ mkDerivation, lib, fetchurl, fetchsvn
22, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
33, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
4−, dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
4+, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
55, tl-expected, hunspell
66# TODO: Shouldn't be required:
77, pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
@@ -42,7 +42,7 @@ mkDerivation rec {
4242
4343 buildInputs = [
4444 qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash
45− dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3
45+ dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
4646 tl-expected hunspell
4747 # TODO: Shouldn't be required:
4848 pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst
pkgs/applications/networking/remote/waypipe/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitLab
22, meson, ninja, pkgconfig, scdoc
33, wayland, wayland-protocols, openssh
4−, mesa, lz4, zstd, ffmpeg_4, libva
4+, mesa, lz4, zstd, ffmpeg, libva
55}:
66
77stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 buildInputs = [
2727 wayland wayland-protocols
2828 # Optional dependencies:
29− mesa lz4 zstd ffmpeg_4 libva
29+ mesa lz4 zstd ffmpeg libva
3030 ];
3131
3232 enableParallelBuilding = true;
pkgs/applications/video/mpv/default.nix+2−2
@@ -1,6 +1,6 @@
11{ config, stdenv, fetchurl, fetchFromGitHub, fetchpatch
22, addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which
3−, ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs
3+, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs
44, nv-codec-headers, lua, libuchardet, libiconv ? null
55, CoreFoundation, Cocoa, CoreAudio, MediaPlayer
66
@@ -155,7 +155,7 @@ in stdenv.mkDerivation rec {
155155 ++ optional swiftSupport swift;
156156
157157 buildInputs = [
158− ffmpeg_4 freetype libass libpthreadstubs
158+ ffmpeg freetype libass libpthreadstubs
159159 luaEnv libuchardet mujs
160160 ] ++ optional alsaSupport alsaLib
161161 ++ optional archiveSupport libarchive
pkgs/applications/video/wf-recorder/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc
2−, wayland-protocols, ffmpeg_4, x264, libpulseaudio, ocl-icd, opencl-headers
2+, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers
33}:
44
55stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ];
1717 buildInputs = [
18− wayland-protocols ffmpeg_4 x264 libpulseaudio ocl-icd opencl-headers
18+ wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers
1919 ];
2020
2121 meta = with stdenv.lib; {
pkgs/development/libraries/wlroots/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
22, libGL, wayland-protocols, libinput, libxkbcommon, pixman
33, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
4−, libpng, ffmpeg_4
4+, libpng, ffmpeg
55}:
66
77stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 buildInputs = [
2424 libGL wayland-protocols libinput libxkbcommon pixman
2525 xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
26− libpng ffmpeg_4
26+ libpng ffmpeg
2727 ];
2828
2929 postInstall = ''
pkgs/development/python-modules/av/default.nix+2−2
@@ -2,7 +2,7 @@
22, buildPythonPackage
33, fetchPypi
44, numpy
5−, ffmpeg_4
5+, ffmpeg
66, pkgconfig
77}:
88
@@ -18,7 +18,7 @@ buildPythonPackage rec {
1818 checkInputs = [ numpy ];
1919
2020 nativeBuildInputs = [ pkgconfig ];
21− buildInputs = [ ffmpeg_4 ];
21+ buildInputs = [ ffmpeg ];
2222
2323 # Tests require downloading files from internet
2424 doCheck = false;
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix+1−1
@@ -24,7 +24,7 @@ self: super:
2424 nativeBuildInputs = old.nativeBuildInputs ++ [
2525 pkgs.pkgconfig
2626 ];
27− buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ];
27+ buildInputs = old.buildInputs ++ [ pkgs.ffmpeg ];
2828 }
2929 );
3030
pkgs/tools/X11/xpra/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText
22, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
33, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
4−, ffmpeg_4, x264, libvpx, libwebp, x265
4+, ffmpeg, x264, libvpx, libwebp, x265
55, libfakeXinerama
66, gst_all_1, pulseaudio, gobject-introspection
77, pam }:
@@ -60,7 +60,7 @@ in buildPythonApplication rec {
6060
6161 pango cairo gdk-pixbuf atk.out gtk3 glib
6262
63− ffmpeg_4 libvpx x264 libwebp x265
63+ ffmpeg libvpx x264 libwebp x265
6464
6565 gst_all_1.gstreamer
6666 gst_all_1.gst-plugins-base
pkgs/tools/misc/diffoscope/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchurl, fetchpatch, runCommand, makeWrapper, python3Packages, docutils, help2man
22, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
3−, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg_4, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
3+, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
44, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R
55, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd
66, enableBloat ? false
@@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec {
6262 ])
6363 ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ]
6464 ++ lib.optionals enableBloat ([
65− abootimg apksigner apktool cbfstool colord ffmpeg_4 fpc ghc ghostscriptX giflib gnupg gnumeric
65+ abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
6666 hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt
6767 ] ++ (with python3Packages; [ binwalk guestfs h5py ]));
6868
pkgs/tools/misc/youtube-dl/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, fetchurl, buildPythonPackage
2−, zip, ffmpeg_4, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
2+, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
33# Pandoc is required to build the package's man page. Release tarballs contain a
44# formatted man page already, though, it will still be installed. We keep the
55# manpage argument in place in case someone wants to use this derivation to
@@ -36,7 +36,7 @@ buildPythonPackage rec {
3636 makeWrapperArgs = let
3737 packagesToBinPath =
3838 [ atomicparsley ]
39− ++ lib.optional ffmpegSupport ffmpeg_4
39+ ++ lib.optional ffmpegSupport ffmpeg
4040 ++ lib.optional rtmpSupport rtmpdump
4141 ++ lib.optional phantomjsSupport phantomjs2;
4242 in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ];
pkgs/top-level/all-packages.nix+6−14
@@ -1968,7 +1968,7 @@ in
19681968
19691969 interlock = callPackage ../servers/interlock {};
19701970
1971− jellyfin = callPackage ../servers/jellyfin { ffmpeg = ffmpeg_4; };
1971+ jellyfin = callPackage ../servers/jellyfin { };
19721972
19731973 jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
19741974
@@ -11719,8 +11719,6 @@ in
1171911719 ffmpeg = ffmpeg_4;
1172011720
1172111721 ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
11722− ffmpeg = ffmpeg_4;
11723−
1172411722 # The following need to be fixed on Darwin
1172511723 frei0r = if stdenv.isDarwin then null else frei0r;
1172611724 game-music-emu = if stdenv.isDarwin then null else game-music-emu;
@@ -12077,7 +12075,7 @@ in
1207712075 gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { };
1207812076
1207912077 gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
12080− callPackage = newScope { libav = pkgs.ffmpeg_4; };
12078+ callPackage = newScope { libav = pkgs.ffmpeg; };
1208112079 inherit (darwin.apple_sdk.frameworks) CoreServices;
1208212080 });
1208312081
@@ -13811,7 +13809,7 @@ in
1381113809 withGUI = false;
1381213810 };
1381313811
13814− mlt = callPackage ../development/libraries/mlt { ffmpeg = ffmpeg_4; };
13812+ mlt = callPackage ../development/libraries/mlt { };
1381513813
1381613814 mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { };
1381713815
@@ -14367,9 +14365,7 @@ in
1436714365
1436814366 kpmcore = callPackage ../development/libraries/kpmcore { };
1436914367
14370− mlt = callPackage ../development/libraries/mlt/qt-5.nix {
14371− ffmpeg = ffmpeg_4;
14372− };
14368+ mlt = callPackage ../development/libraries/mlt/qt-5.nix { };
1437314369
1437414370 openbr = callPackage ../development/libraries/openbr { };
1437514371
@@ -18871,7 +18867,6 @@ in
1887118867 bibletime = libsForQt5.callPackage ../applications/misc/bibletime { };
1887218868
1887318869 bino3d = libsForQt5.callPackage ../applications/video/bino3d {
18874− ffmpeg = ffmpeg_4;
1887518870 glew = glew110;
1887618871 };
1887718872
@@ -21382,7 +21377,7 @@ in
2138221377
2138321378 obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { };
2138421379
21385− obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { ffmpeg = ffmpeg_4; };
21380+ obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { };
2138621381
2138721382 obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };
2138821383
@@ -23663,7 +23658,6 @@ in
2366323658 inherit (plasma5) oxygen;
2366423659 inherit (kdeApplications) akonadi-contacts;
2366523660 inherit (kdeFrameworks) kcalendarcore;
23666− ffmpeg = ffmpeg_4;
2366723661 opencv3 = opencv3WithoutCuda;
2366823662 };
2366923663
@@ -26370,9 +26364,7 @@ in
2637026364
2637126365 vazir-fonts = callPackage ../data/fonts/vazir-fonts { };
2637226366
26373− vbam = callPackage ../misc/emulators/vbam {
26374− ffmpeg = ffmpeg_4;
26375− };
26367+ vbam = callPackage ../misc/emulators/vbam { };
2637626368
2637726369 vice = callPackage ../misc/emulators/vice {
2637826370 giflib = giflib_4_1;