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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText
, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
, ffmpeg_4, x264, libvpx, libwebp, x265
, ffmpeg, x264, libvpx, libwebp, x265
, libfakeXinerama
, gst_all_1, pulseaudio, gobject-introspection
, pam }:
@@ -60,7 +60,7 @@ in buildPythonApplication rec {
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.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
, 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
, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd
, enableBloat ? false
@@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec {
])
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ]
++ 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
] ++ (with python3Packages; [ binwalk guestfs h5py ]));

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

@@ -1,5 +1,5 @@
{ 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
# 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
@@ -36,7 +36,7 @@ buildPythonPackage rec {
makeWrapperArgs = let
packagesToBinPath =
[ atomicparsley ]
++ lib.optional ffmpegSupport ffmpeg_4
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional rtmpSupport rtmpdump
++ lib.optional phantomjsSupport phantomjs2;
in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ];