From e25434801b77eea206e47058b520b0588b08d43d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:26:33 -0500 Subject: [PATCH] fmit: build with Qt 5.5 --- pkgs/applications/audio/fmit/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index fe1f4c85c30..16573936068 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, freeglut, qt5 +{ stdenv, fetchFromGitHub, fftw, freeglut, qtbase, qtmultimedia , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "gillesdegottex"; }; - buildInputs = [ fftw freeglut qt5.base qt5.multimedia ] + buildInputs = [ fftw freeglut qtbase qtmultimedia ] ++ stdenv.lib.optional alsaSupport [ alsaLib ] ++ stdenv.lib.optional jackSupport [ libjack2 ] ++ stdenv.lib.optional portaudioSupport [ portaudio ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61143d10f80..32630d05b47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11339,7 +11339,7 @@ let fluidsynth = callPackage ../applications/audio/fluidsynth { }; - fmit = callPackage ../applications/audio/fmit { }; + fmit = qt5Libs.callPackage ../applications/audio/fmit { }; focuswriter = callPackage ../applications/editors/focuswriter { };