diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-08-31 19:28:43 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-08-31 19:29:09 +0200 |
| commit | be91ec0fd73cda879e0f4fa709e4ea004798668c (patch) | |
| tree | 654992aa33c991d146c509c526c8880f9b6b9f08 /pkgs/applications/audio/fmit | |
| parent | 6f19418b654b440f9b7e40fa898f3681f51bca0d (diff) | |
| download | nixlib-be91ec0fd73cda879e0f4fa709e4ea004798668c.tar nixlib-be91ec0fd73cda879e0f4fa709e4ea004798668c.tar.gz nixlib-be91ec0fd73cda879e0f4fa709e4ea004798668c.tar.bz2 nixlib-be91ec0fd73cda879e0f4fa709e4ea004798668c.tar.lz nixlib-be91ec0fd73cda879e0f4fa709e4ea004798668c.tar.xz nixlib-be91ec0fd73cda879e0f4fa709e4ea004798668c.tar.zst nixlib-be91ec0fd73cda879e0f4fa709e4ea004798668c.zip | |
fmit: qt53Full -> modular qt5 (currently 5.4)
See https://github.com/NixOS/nixpkgs/pull/9560. "Native" Qt audio capture is now broken (patches/time welcome). ALSA should work just as well and is now enabled by default until Qt is fixed.
Diffstat (limited to 'pkgs/applications/audio/fmit')
| -rw-r--r-- | pkgs/applications/audio/fmit/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 84ec955de3f3..50c5449e422a 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,7 +1,5 @@ -# FIXME: upgrading qt5Full (Qt 5.3) to qt5.{base,multimedia} (Qt 5.4) breaks -# the default Qt audio capture source! -{ stdenv, fetchFromGitHub, fftw, freeglut, qt5Full -, alsaSupport ? false, alsaLib ? null +{ stdenv, fetchFromGitHub, fftw, freeglut, qt5 +, alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null }: assert alsaSupport -> alsaLib != null; @@ -18,7 +16,7 @@ stdenv.mkDerivation { owner = "gillesdegottex"; }; - buildInputs = [ fftw freeglut qt5Full ] + buildInputs = [ fftw freeglut qt5.base qt5.multimedia ] ++ stdenv.lib.optional alsaSupport [ alsaLib ] ++ stdenv.lib.optional jackSupport [ libjack2 ]; |