Merge remote-tracking branch 'upstream/master' into staging

2018-05-10 13:29:04 -04:00
parent d1c4260859 4ae207aea0
commit f40aa17933
14 changed files with 68 additions and 100 deletions
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
      "--enable-ffmpeg"
      "--disable-ffplay"
      (ifMinVer "0.6" "--enable-ffprobe")
-      "--disable-ffserver"
+      (if reqMin "4" then null else "--disable-ffserver")
    # Libraries
      (ifMinVer "0.6" "--enable-avcodec")
      (ifMinVer "0.6" "--enable-avdevice")