mplayer: remove useless nulls
This commit is contained in:
parent
5007ea281d
commit
c07b5cd424
|
@ -1,60 +1,37 @@
|
||||||
{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg
|
{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg
|
||||||
, aalibSupport ? true, aalib ? null
|
, aalibSupport ? true, aalib
|
||||||
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
|
, fontconfigSupport ? true, fontconfig, freefont_ttf
|
||||||
, fribidiSupport ? true, fribidi ? null
|
, fribidiSupport ? true, fribidi
|
||||||
, x11Support ? true, libX11 ? null, libXext ? null, libGLU, libGL ? null
|
, x11Support ? true, libX11, libXext, libGLU, libGL
|
||||||
, xineramaSupport ? true, libXinerama ? null
|
, xineramaSupport ? true, libXinerama
|
||||||
, xvSupport ? true, libXv ? null
|
, xvSupport ? true, libXv
|
||||||
, alsaSupport ? stdenv.isLinux, alsa-lib ? null
|
, alsaSupport ? stdenv.isLinux, alsa-lib
|
||||||
, screenSaverSupport ? true, libXScrnSaver ? null
|
, screenSaverSupport ? true, libXScrnSaver
|
||||||
, vdpauSupport ? false, libvdpau ? null
|
, vdpauSupport ? false, libvdpau
|
||||||
, cddaSupport ? !stdenv.isDarwin, cdparanoia ? null
|
, cddaSupport ? !stdenv.isDarwin, cdparanoia
|
||||||
, dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null
|
, dvdnavSupport ? !stdenv.isDarwin, libdvdnav
|
||||||
, dvdreadSupport ? true, libdvdread ? null
|
, dvdreadSupport ? true, libdvdread
|
||||||
, bluraySupport ? true, libbluray ? null
|
, bluraySupport ? true, libbluray
|
||||||
, amrSupport ? false, amrnb ? null, amrwb ? null
|
, amrSupport ? false, amrnb, amrwb
|
||||||
, cacaSupport ? true, libcaca ? null
|
, cacaSupport ? true, libcaca
|
||||||
, lameSupport ? true, lame ? null
|
, lameSupport ? true, lame
|
||||||
, speexSupport ? true, speex ? null
|
, speexSupport ? true, speex
|
||||||
, theoraSupport ? true, libtheora ? null
|
, theoraSupport ? true, libtheora
|
||||||
, x264Support ? false, x264 ? null
|
, x264Support ? false, x264
|
||||||
, jackaudioSupport ? false, libjack2 ? null
|
, jackaudioSupport ? false, libjack2
|
||||||
, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null
|
, pulseSupport ? config.pulseaudio or false, libpulseaudio
|
||||||
, bs2bSupport ? false, libbs2b ? null
|
, bs2bSupport ? false, libbs2b
|
||||||
, v4lSupport ? false, libv4l ? null
|
, v4lSupport ? false, libv4l
|
||||||
# For screenshots
|
# For screenshots
|
||||||
, libpngSupport ? true, libpng ? null
|
, libpngSupport ? true, libpng
|
||||||
, libjpegSupport ? true, libjpeg ? null
|
, libjpegSupport ? true, libjpeg
|
||||||
, useUnfreeCodecs ? false
|
, useUnfreeCodecs ? false
|
||||||
, darwin ? null
|
, darwin
|
||||||
, buildPackages
|
, buildPackages
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert fontconfigSupport -> (fontconfig != null);
|
assert xineramaSupport -> x11Support;
|
||||||
assert (!fontconfigSupport) -> (freefont_ttf != null);
|
assert xvSupport -> x11Support;
|
||||||
assert fribidiSupport -> (fribidi != null);
|
|
||||||
assert x11Support -> (libX11 != null && libXext != null && libGLU != null && libGL != null);
|
|
||||||
assert xineramaSupport -> (libXinerama != null && x11Support);
|
|
||||||
assert xvSupport -> (libXv != null && x11Support);
|
|
||||||
assert alsaSupport -> alsa-lib != null;
|
|
||||||
assert screenSaverSupport -> libXScrnSaver != null;
|
|
||||||
assert vdpauSupport -> libvdpau != null;
|
|
||||||
assert cddaSupport -> cdparanoia != null;
|
|
||||||
assert dvdnavSupport -> libdvdnav != null;
|
|
||||||
assert dvdreadSupport -> libdvdread != null;
|
|
||||||
assert bluraySupport -> libbluray != null;
|
|
||||||
assert amrSupport -> (amrnb != null && amrwb != null);
|
|
||||||
assert cacaSupport -> libcaca != null;
|
|
||||||
assert lameSupport -> lame != null;
|
|
||||||
assert speexSupport -> speex != null;
|
|
||||||
assert theoraSupport -> libtheora != null;
|
|
||||||
assert x264Support -> x264 != null;
|
|
||||||
assert jackaudioSupport -> libjack2 != null;
|
|
||||||
assert pulseSupport -> libpulseaudio != null;
|
|
||||||
assert bs2bSupport -> libbs2b != null;
|
|
||||||
assert libpngSupport -> libpng != null;
|
|
||||||
assert libjpegSupport -> libjpeg != null;
|
|
||||||
assert v4lSupport -> libv4l != null;
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue