Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fluidsynth 1 #52361

Merged
merged 4 commits into from
Dec 18, 2018
Merged

Fluidsynth 1 #52361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffc586c
fluidsynth_1: init at 1.1.11
rardiol Dec 16, 2018
86fac8b
csound: depend on fluidsynth_1
rardiol Dec 16, 2018
6bdcc10
fluidsynth: keep version
lheckemann Dec 18, 2018
a532c63
csound: document temp dependency on fluidsynth 1
lheckemann Dec 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkgs/applications/audio/csound/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
24 changes: 20 additions & 4 deletions pkgs/applications/audio/fluidsynth/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, it would be good to leave the fluidsynth 2.x derivation unchanged, thus avoiding a mass-rebuild. You'd just need to add the version line back as version = fluidsynthVersion;.

name = "fluidsynth-${fluidsynthVersion}";
version = fluidsynthVersion;

src = fetchFromGitHub {
owner = "FluidSynth";
repo = "fluidsynth";
rev = "v${version}";
sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7";
rev = "v${fluidsynthVersion}";
inherit sha256;
};

nativeBuildInputs = [ pkgconfig cmake ];
Expand Down
5 changes: 4 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -16836,6 +16838,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 { };

Expand Down