Merge pull request #121076 from minijackson/carla-remove-ffmpeg

carla: remove ffmpeg as dependency
This commit is contained in:
Sandro 2021-04-29 03:21:06 +02:00 committed by GitHub
commit 01d55fcd5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg_3, jack2, { lib, stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, jack2,
liblo, libpulseaudio, libsndfile, pkg-config, python3Packages, liblo, libpulseaudio, libsndfile, pkg-config, python3Packages,
which, withFrontend ? true, which, withFrontend ? true,
withQt ? true, qtbase ? null, wrapQtAppsHook ? null, withQt ? true, qtbase ? null, wrapQtAppsHook ? null,
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
] ++ optional withFrontend pyqt5; ] ++ optional withFrontend pyqt5;
buildInputs = [ buildInputs = [
file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile file liblo alsaLib fluidsynth jack2 libpulseaudio libsndfile
] ++ optional withQt qtbase ] ++ optional withQt qtbase
++ optional withGtk2 gtk2 ++ optional withGtk2 gtk2
++ optional withGtk3 gtk3; ++ optional withGtk3 gtk3;