From 87442aa4f3ede7cb3338b978974dcb897487599d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 May 2016 15:02:35 +0200 Subject: [PATCH] fmit: 1.0.13 -> 1.0.14 --- pkgs/applications/audio/fmit/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index d99e2e577eb..05f4f6314e4 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -7,33 +7,35 @@ assert alsaSupport -> alsaLib != null; assert jackSupport -> libjack2 != null; assert portaudioSupport -> portaudio != null; +with stdenv.lib; + stdenv.mkDerivation rec { name = "fmit-${version}"; - version = "1.0.13"; + version = "1.0.14"; src = fetchFromGitHub { - sha256 = "04cj70q60sqns68nvw4zfy6078x4cc2q1y2y13z3rs5n80jw27by"; + sha256 = "1f8raqpqqyr02lnpxxpg69a2if1nbw0za71x62kcp3pms1qc0mbh"; rev = "v${version}"; repo = "fmit"; owner = "gillesdegottex"; }; buildInputs = [ fftw freeglut mesa_glu qtbase qtmultimedia qmakeHook ] - ++ stdenv.lib.optionals alsaSupport [ alsaLib ] - ++ stdenv.lib.optionals jackSupport [ libjack2 ] - ++ stdenv.lib.optionals portaudioSupport [ portaudio ]; + ++ optionals alsaSupport [ alsaLib ] + ++ optionals jackSupport [ libjack2 ] + ++ optionals portaudioSupport [ portaudio ]; preConfigure = '' qmakeFlags="$qmakeFlags \ - CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \ - CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \ - CONFIG+=${stdenv.lib.optionalString portaudioSupport "acs_portaudio"} \ + CONFIG+=${optionalString alsaSupport "acs_alsa"} \ + CONFIG+=${optionalString jackSupport "acs_jack"} \ + CONFIG+=${optionalString portaudioSupport "acs_portaudio"} \ PREFIXSHORTCUT=$out" ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = { description = "Free Musical Instrument Tuner"; longDescription = '' FMIT is a graphical utility for tuning musical instruments, with error