diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 14:51:51 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 14:51:51 -0400 |
| commit | d5758c99a315faac7e0631ae4e7bd707095be3c1 (patch) | |
| tree | 9177bc0c57faffe2d7fcbc562f43171f67c337eb /pkgs/applications/video/MPlayer/default.nix | |
| parent | 3aae4ccffa8bdaea0bcc136c39fdc33729e76af3 (diff) | |
| parent | e710915ffc681b06a61ab2257e44c1cd8abbd0ef (diff) | |
| download | nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.gz nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.bz2 nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.lz nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.xz nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.zst nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.zip | |
Merge remote-tracking branch 'origin/master' into x-updates
Conflicts: pkgs/misc/maven/maven-1.0.nix pkgs/os-specific/linux/xf86-input-wacom/default.nix
Diffstat (limited to 'pkgs/applications/video/MPlayer/default.nix')
| -rw-r--r-- | pkgs/applications/video/MPlayer/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 3c1cd2ff4472..566089201cda 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype zlib pkgconfig ] - ++ stdenv.lib.optional x11Support [ libX11 libXext mesa ] + ++ stdenv.lib.optionals x11Support [ libX11 libXext mesa ] ++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional theoraSupport libtheora |