diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-01-23 17:56:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-23 17:56:42 +0100 |
commit | baaf8fd2b8fa061a8d073dd85714c5cc5c651c65 (patch) | |
tree | 0dc8b40f56c1749054d4ed95dff0bd3efcca54e9 | |
parent | 8510550b77234c08ca233c777243d6ef46f3120c (diff) | |
parent | ad566a0c57eeea530413aafc2f6c652a1821fd8c (diff) |
Merge pull request #33495 from magnetophon/faust2
faust2: 2.1.0 -> 2.5.10
-rw-r--r-- | pkgs/applications/audio/faust/faust2.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/audio/faust/faust2jack.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/faust/faust2jaqt.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 901df19ebf596..460c9da7ac310 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -16,13 +16,14 @@ with stdenv.lib.strings; let - version = "2.1.0"; + version = "2.5.10"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = "v${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1pmiwy287g79ipz9pppnkfrdgls3l912kpkr7dfymk9wk5y5di9m"; + sha256 = "0sjhy7axa2dj1977iz6zmqvz9qzalcfnrx2fqx3xmk9hly847d6z"; + fetchSubmodules = true; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index 3867114562d56..7762ca393690d 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -2,6 +2,7 @@ , gtk2 , jack2Full , opencv +, libsndfile }: faust.wrapWithBuildEnv { @@ -18,6 +19,7 @@ faust.wrapWithBuildEnv { gtk2 jack2Full opencv + libsndfile ]; } diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index c0911b3153862..5a015e5ca31e5 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -2,6 +2,7 @@ , jack2Full , opencv , qt4 +, libsndfile }: faust.wrapWithBuildEnv { @@ -17,6 +18,7 @@ faust.wrapWithBuildEnv { jack2Full opencv qt4 + libsndfile ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66297b9a05468..0123190fa08a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19621,7 +19621,7 @@ with pkgs; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; faust2 = callPackage ../applications/audio/faust/faust2.nix { - llvm = llvm_38; + llvm = llvm_4; }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; |