diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index da3cff0bac2..450ece6a12f 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { name = "csound-${version}"; + # 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.12.0"; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 33ac7218778..d40544a0fa4 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,17 +1,33 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake , alsaLib, glib, libjack2, libsndfile, libpulseaudio , AudioUnit, CoreAudio, CoreMIDI, CoreServices +, version ? "2" }: +let + versionMap = { + "1" = { + fluidsynthVersion = "1.1.11"; + sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"; + }; + "2" = { + fluidsynthVersion = "2.0.1"; + sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7"; + }; + }; +in + +with versionMap.${version}; + stdenv.mkDerivation rec { - name = "fluidsynth-${version}"; - version = "2.0.1"; + name = "fluidsynth-${fluidsynthVersion}"; + version = fluidsynthVersion; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; - rev = "v${version}"; - sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7"; + rev = "v${fluidsynthVersion}"; + inherit sha256; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bd56de96b8..ef4928b0b91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16327,7 +16327,9 @@ in csa = callPackage ../applications/audio/csa { }; - csound = callPackage ../applications/audio/csound { }; + csound = callPackage ../applications/audio/csound { + fluidsynth = fluidsynth_1; + }; csound-qt = callPackage ../applications/audio/csound/csound-qt { python = python27; @@ -16902,6 +16904,7 @@ in fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; }; + fluidsynth_1 = fluidsynth.override { version = "1"; }; fmit = libsForQt5.callPackage ../applications/audio/fmit { };