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

mplayer: move defaults to package file

Browse Source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:31:20 +00:00
parent 88ca6dd78a
commit 20193f85e9
2 changed files with 2 additions and 3 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 @@
{ stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg
{ config, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg
, aalibSupport ? true, aalib ? null
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
, fribidiSupport ? true, fribidi ? null
@ -19,7 +19,7 @@
, theoraSupport ? true, libtheora ? null
, x264Support ? false, x264 ? null
, jackaudioSupport ? false, libjack2 ? null
, pulseSupport ? false, libpulseaudio ? null
, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
# For screenshots
, libpngSupport ? true, libpng ? null

1
pkgs/top-level/all-packages.nix
View File

@ -18278,7 +18278,6 @@ in
mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { };
mplayer = callPackage ../applications/video/mplayer ({
pulseSupport = config.pulseaudio or false;
libdvdnav = libdvdnav_4_2_1;
} // (config.mplayer or {}));