csound: build with fluidsynth 2.x

csound has supported FluidSynth 2 since 6.13.0:
https://github.com/csound/csound/pull/1106

Since fluidsynth_1 has finally been broken by glib 2.70.0, so now is a
good opportunity to get rid of this dependency.
This commit is contained in:
sternenseemann 2021-10-13 15:44:10 +02:00
parent eb3a3725e4
commit aa0a596e6c
2 changed files with 1 additions and 6 deletions

View File

@ -14,9 +14,6 @@
stdenv.mkDerivation rec {
pname = "csound";
# When updating, please check if https://github.com/csound/csound/issues/1078
# has been fixed in the new version so we can use the normal fluidsynth
# version and remove fluidsynth 1.x from nixpkgs again.
version = "6.16.2";
hardeningDisable = [ "format" ];

View File

@ -24004,9 +24004,7 @@ with pkgs;
csa = callPackage ../applications/audio/csa { };
csound = callPackage ../applications/audio/csound {
fluidsynth = fluidsynth_1;
};
csound = callPackage ../applications/audio/csound { };
csound-manual = callPackage ../applications/audio/csound/csound-manual {
python = python27;