From ffc586cf49c0ded1026e92b0fa8d9cb2805be6ba Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sun, 16 Dec 2018 09:30:10 -0200 Subject: [PATCH 1/4] fluidsynth_1: init at 1.1.11 --- .../applications/audio/fluidsynth/default.nix | 23 +++++++++++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 33ac7218778..8727c49398e 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,17 +1,32 @@ { 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}"; 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 64ef63f55ab..82db9a17f38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16836,6 +16836,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 { }; From 86fac8b52863dac169f92c9b5abb286244a8db28 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sun, 16 Dec 2018 09:30:16 -0200 Subject: [PATCH 2/4] csound: depend on fluidsynth_1 csound is incompatible with fluidsynth 2 https://github.com/csound/csound/issues/1078 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82db9a17f38..bb1be7dc2e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16267,7 +16267,9 @@ in csa = callPackage ../applications/audio/csa { }; - csound = callPackage ../applications/audio/csound { }; + csound = callPackage ../applications/audio/csound { + fluidsynth = fluidsynth_1; + }; cinepaint = callPackage ../applications/graphics/cinepaint { fltk = fltk13; From 6bdcc10767dd0c3c96ad1a3c24b4bae38bea3fe1 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 18 Dec 2018 09:30:32 +0100 Subject: [PATCH 3/4] fluidsynth: keep version This avoids a mass-rebuild for packages which depend on fluidsynth 2.x. --- pkgs/applications/audio/fluidsynth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8727c49398e..d40544a0fa4 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -21,6 +21,7 @@ with versionMap.${version}; stdenv.mkDerivation rec { name = "fluidsynth-${fluidsynthVersion}"; + version = fluidsynthVersion; src = fetchFromGitHub { owner = "FluidSynth"; From a532c6318ac2ad112f9c9ac9f6c5455db0633c9f Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 18 Dec 2018 09:46:15 +0100 Subject: [PATCH 4/4] csound: document temp dependency on fluidsynth 1 --- pkgs/applications/audio/csound/default.nix | 3 +++ 1 file changed, 3 insertions(+) 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;