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

Merge pull request #120643 from dotlambda/mplayer-ffmpeg

Browse Source 
mplayer: use ffmpeg instead of ffmpeg_3
This commit is contained in:
Sandro 2021-04-27 15:26:08 +02:00 committed by GitHub
commit daa65fe748
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg_3 { config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg
, aalibSupport ? true, aalib ? null , aalibSupport ? true, aalib ? null
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
, fribidiSupport ? true, fribidi ? null , fribidiSupport ? true, fribidi ? null
@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config yasm ]; nativeBuildInputs = [ pkg-config yasm ];
buildInputs = with lib; buildInputs = with lib;
[ freetype ffmpeg_3 ] [ freetype ffmpeg ]
++ optional aalibSupport aalib ++ optional aalibSupport aalib
++ optional fontconfigSupport fontconfig ++ optional fontconfigSupport fontconfig
++ optional fribidiSupport fribidi ++ optional fribidiSupport fribidi