diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2021-10-13 15:44:10 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2021-10-13 15:44:10 +0200 |
| commit | aa0a596e6c2399cc1bc5f29e850d49ef6eccbc7e (patch) | |
| tree | 571db32fc4874995a2f0ec66834dec118536ed9c /pkgs | |
| parent | eb3a3725e43f7d9b3408555e18a7ecacf07148f0 (diff) | |
| download | nixpkgs-aa0a596e6c2399cc1bc5f29e850d49ef6eccbc7e.tar nixpkgs-aa0a596e6c2399cc1bc5f29e850d49ef6eccbc7e.tar.gz nixpkgs-aa0a596e6c2399cc1bc5f29e850d49ef6eccbc7e.tar.bz2 nixpkgs-aa0a596e6c2399cc1bc5f29e850d49ef6eccbc7e.tar.lz nixpkgs-aa0a596e6c2399cc1bc5f29e850d49ef6eccbc7e.tar.xz nixpkgs-aa0a596e6c2399cc1bc5f29e850d49ef6eccbc7e.tar.zst nixpkgs-aa0a596e6c2399cc1bc5f29e850d49ef6eccbc7e.zip | |
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.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/csound/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 029710206f0..ab3267eae7f 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -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" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3197712d39..7af76a7bbfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |