Merge pull request #33495 from magnetophon/faust2

faust2: 2.1.0 -> 2.5.10
This commit is contained in:
Frederik Rietdijk 2018-01-23 17:56:42 +01:00 committed by GitHub
commit baaf8fd2b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions

View File

@ -16,13 +16,14 @@ with stdenv.lib.strings;
let let
version = "2.1.0"; version = "2.5.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grame-cncm"; owner = "grame-cncm";
repo = "faust"; repo = "faust";
rev = "v${builtins.replaceStrings ["."] ["-"] version}"; rev = "v${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "1pmiwy287g79ipz9pppnkfrdgls3l912kpkr7dfymk9wk5y5di9m"; sha256 = "0sjhy7axa2dj1977iz6zmqvz9qzalcfnrx2fqx3xmk9hly847d6z";
fetchSubmodules = true;
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -2,6 +2,7 @@
, gtk2 , gtk2
, jack2Full , jack2Full
, opencv , opencv
, libsndfile
}: }:
faust.wrapWithBuildEnv { faust.wrapWithBuildEnv {
@ -18,6 +19,7 @@ faust.wrapWithBuildEnv {
gtk2 gtk2
jack2Full jack2Full
opencv opencv
libsndfile
]; ];
} }

View File

@ -2,6 +2,7 @@
, jack2Full , jack2Full
, opencv , opencv
, qt4 , qt4
, libsndfile
}: }:
faust.wrapWithBuildEnv { faust.wrapWithBuildEnv {
@ -17,6 +18,7 @@ faust.wrapWithBuildEnv {
jack2Full jack2Full
opencv opencv
qt4 qt4
libsndfile
]; ];
} }

View File

@ -19621,7 +19621,7 @@ with pkgs;
faust1 = callPackage ../applications/audio/faust/faust1.nix { }; faust1 = callPackage ../applications/audio/faust/faust1.nix { };
faust2 = callPackage ../applications/audio/faust/faust2.nix { faust2 = callPackage ../applications/audio/faust/faust2.nix {
llvm = llvm_38; llvm = llvm_4;
}; };
faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { };