nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 04:13:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #337316 from emilazy/push-uvyzotvnqrqy

Browse Source 
mplayer: unpin FFmpeg 6
This commit is contained in:
Emily 2024-08-25 22:13:45 +01:00 committed by GitHub
commit 984109c441
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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, fetchsvn, pkg-config, freetype, yasm, ffmpeg_6 { config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_7
, aalibSupport ? true, aalib , aalibSupport ? true, aalib
, fontconfigSupport ? true, fontconfig, freefont_ttf , fontconfigSupport ? true, fontconfig, freefont_ttf
, fribidiSupport ? true, fribidi , fribidiSupport ? true, fribidi
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config yasm ]; nativeBuildInputs = [ pkg-config yasm ];
buildInputs = [ freetype ffmpeg_6 ] buildInputs = [ freetype ffmpeg_7 ]
++ lib.optional aalibSupport aalib ++ lib.optional aalibSupport aalib
++ lib.optional fontconfigSupport fontconfig ++ lib.optional fontconfigSupport fontconfig
++ lib.optional fribidiSupport fribidi ++ lib.optional fribidiSupport fribidi