diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-06-13 12:31:01 +1000 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-06-16 18:23:14 -0700 |
| commit | 78e324d2726127828a15f87a75b4d3199a8955ec (patch) | |
| tree | 98f941c481d296b5215b8d8162ae720a640d2df6 /pkgs/tools/misc/diffoscope | |
| parent | 0a63b5ae34c29f6c50db4acc0c11ebb6058372c7 (diff) | |
| download | nixpkgs-78e324d2726127828a15f87a75b4d3199a8955ec.tar nixpkgs-78e324d2726127828a15f87a75b4d3199a8955ec.tar.gz nixpkgs-78e324d2726127828a15f87a75b4d3199a8955ec.tar.bz2 nixpkgs-78e324d2726127828a15f87a75b4d3199a8955ec.tar.lz nixpkgs-78e324d2726127828a15f87a75b4d3199a8955ec.tar.xz nixpkgs-78e324d2726127828a15f87a75b4d3199a8955ec.tar.zst nixpkgs-78e324d2726127828a15f87a75b4d3199a8955ec.zip | |
treewide: ffmpeg_4 -> ffmpeg
Diffstat (limited to 'pkgs/tools/misc/diffoscope')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index dfd227f917e..5e5550e0b41 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -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 ])); |