diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 051caf120fa2..995618af4ce5 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with lib.strings; let - version = "unstable-2020-08-27"; + version = "2.30.5"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "c10f316fa90f338e248787ebf55e3795c3a0d70e"; - sha256 = "068pm04ddafbsj2r8akdpqyzb0m8mp9ql0rgi83hcqs4ndr8v7sb"; + rev = version; + sha256 = "0cs52w4rwaj5d8pjak4cxsg02sxvx4y07592nc3ck81clqjmszmm"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 20afb6fd7617..2b4602f78cfd 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,22 +1,24 @@ { lib, stdenv, fetchFromGitHub -, llvm, qt48Full, qrencode, libmicrohttpd_0_9_70, libjack2, alsaLib, faust, curl -, bc, coreutils, which, libsndfile, pkg-config +, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl +, bc, coreutils, which, libsndfile, pkg-config, libxcb }: stdenv.mkDerivation rec { pname = "faustlive"; - version = "unstable-dev-2020-08-03"; + version = "2.5.5"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; - rev = "c16565dc1b616ac0aad7c303c1997fa9e57177ab"; - sha256 = "1ys661lp1xwz21vy12kwkg248jvjq1z9w433knkh0ldyy2igvmd5"; + rev = version; + sha256 = "0qbn05nq170ckycwalkk5fppklc4g457mapr7p7ryrhc1hwzffm9"; fetchSubmodules = true; }; + nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook ]; + buildInputs = [ - llvm qt48Full qrencode libmicrohttpd_0_9_70 libjack2 alsaLib faust curl - bc coreutils which libsndfile pkg-config + llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsaLib faust curl + bc coreutils which libsndfile libxcb ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -39,5 +41,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://faust.grame.fr/"; license = licenses.gpl3; + maintainers = with maintainers; [ magnetophon ]; }; }