mplayer: fix build with structuredAttrs
Entries in configureFlags should be single flags, not multiple space separated flags per string.
This commit is contained in:
@@ -180,7 +180,20 @@ stdenv.mkDerivation {
|
||||
configureFlags = [
|
||||
"--enable-freetype"
|
||||
(if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig")
|
||||
(if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl")
|
||||
]
|
||||
++ (
|
||||
if x11Support then
|
||||
[
|
||||
"--enable-x11"
|
||||
"--enable-gl"
|
||||
]
|
||||
else
|
||||
[
|
||||
"--disable-x11"
|
||||
"--disable-gl"
|
||||
]
|
||||
)
|
||||
++ [
|
||||
(if xineramaSupport then "--enable-xinerama" else "--disable-xinerama")
|
||||
(if xvSupport then "--enable-xv" else "--disable-xv")
|
||||
(if alsaSupport then "--enable-alsa" else "--disable-alsa")
|
||||
@@ -191,25 +204,61 @@ stdenv.mkDerivation {
|
||||
(if bluraySupport then "--enable-bluray" else "--disable-bluray")
|
||||
(if amrSupport then "--enable-libopencore_amrnb" else "--disable-libopencore_amrnb")
|
||||
(if cacaSupport then "--enable-caca" else "--disable-caca")
|
||||
(
|
||||
if lameSupport then
|
||||
"--enable-mp3lame --disable-mp3lame-lavc"
|
||||
else
|
||||
"--disable-mp3lame --enable-mp3lame-lavc"
|
||||
)
|
||||
]
|
||||
++ (
|
||||
if lameSupport then
|
||||
[
|
||||
"--enable-mp3lame"
|
||||
"--disable-mp3lame-lavc"
|
||||
]
|
||||
else
|
||||
[
|
||||
"--disable-mp3lame"
|
||||
"--enable-mp3lame-lavc"
|
||||
]
|
||||
)
|
||||
++ [
|
||||
(if speexSupport then "--enable-speex" else "--disable-speex")
|
||||
(if theoraSupport then "--enable-theora" else "--disable-theora")
|
||||
(if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc")
|
||||
]
|
||||
++ (
|
||||
if x264Support then
|
||||
[
|
||||
"--enable-x264"
|
||||
"--disable-x264-lavc"
|
||||
]
|
||||
else
|
||||
[
|
||||
"--disable-x264"
|
||||
"--enable-x264-lavc"
|
||||
]
|
||||
)
|
||||
++ [
|
||||
(if jackaudioSupport then "" else "--disable-jack")
|
||||
(if pulseSupport then "--enable-pulse" else "--disable-pulse")
|
||||
(
|
||||
if v4lSupport then
|
||||
"--enable-v4l2 --enable-tv-v4l2 --enable-radio --enable-radio-v4l2 --enable-radio-capture"
|
||||
else
|
||||
"--disable-v4l2 --disable-tv-v4l2 --disable-radio --disable-radio-v4l2 --disable-radio-capture"
|
||||
)
|
||||
]
|
||||
++ (
|
||||
if v4lSupport then
|
||||
[
|
||||
"--enable-v4l2"
|
||||
"--enable-tv-v4l2"
|
||||
"--enable-radio"
|
||||
"--enable-radio-v4l2"
|
||||
"--enable-radio-capture"
|
||||
]
|
||||
else
|
||||
[
|
||||
"--disable-v4l2"
|
||||
"--disable-tv-v4l2"
|
||||
"--disable-radio"
|
||||
"--disable-radio-v4l2"
|
||||
"--disable-radio-capture"
|
||||
]
|
||||
)
|
||||
++ [
|
||||
"--disable-xanim"
|
||||
"--disable-xvid --disable-xvid-lavc"
|
||||
"--disable-xvid"
|
||||
"--disable-xvid-lavc"
|
||||
"--disable-ossaudio"
|
||||
"--disable-ffmpeg_a"
|
||||
"--yasm=${buildPackages.yasm}/bin/yasm"
|
||||
|
||||
Reference in New Issue
Block a user