Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-03-28 21:15:15 +01:00
639 changed files with 13721 additions and 10162 deletions
+2 -2
View File
@@ -3,7 +3,7 @@
, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
, libGLU, libxcb, lilv, lv2, opusfile
, pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg
, qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK
, qtx11extras, rubberband, scons, sqlite, taglib, upower, vamp-plugin-sdk
}:
mkDerivation rec {
@@ -21,7 +21,7 @@ mkDerivation rec {
buildInputs = [
chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile
libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
qtx11extras rubberband sqlite taglib upower vampSDK
qtx11extras rubberband sqlite taglib upower vamp-plugin-sdk
];
enableParallelBuilding = true;