@@ -1,33 +1,64 @@
1−{ lib, stdenv, fetchFromGitHub , alsa-lib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre
2−, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkg-config, zlib, xorg
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, alsa-lib
5+, boost
6+, cairo
7+, cmake
8+, fftwSinglePrec
9+, fltk
10+, libGLU
11+, libjack2
12+, libsndfile
13+, libXdmcp
14+, lv2
15+, minixml
16+, pcre
17+, pkg-config
18+, readline
19+, xorg
20+, zlib
321}:
422
523assert stdenv ? glibc;
624
7−stdenv.mkDerivation rec {
25+stdenv.mkDerivation rec {
826 pname = "yoshimi";
9− # Fix build with lv2 1.18: https://github.com/Yoshimi/yoshimi/pull/102/commits/86996cbb235f0fe138ae814a6758c2c8ba1c2a38
10− version = "unstable-2020-05-10";
27+ version = "2.1.2.2";
1128
1229 src = fetchFromGitHub {
1330 owner = "Yoshimi";
1431 repo = pname;
15− rev = "86996cbb235f0fe138ae814a6758c2c8ba1c2a38";
16− sha256 = "0bgcc5fbgwpdjircq00wlii30pakf45yzligpbnf02a554hh4j01";
32+ rev = version;
33+ hash = "sha256-6YsA6tC94yJuuWp5rXXqHzqRy28tvmJzjOR92YwQYO0=";
1734 };
18− buildInputs = [
19− alsa-lib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL
20− minixml zlib xorg.libpthreadstubs pcre
21− ];
2235
23− nativeBuildInputs = [ cmake pkg-config ];
36+ sourceRoot = "source/src";
2437
25− patchPhase = ''
26− substituteInPlace src/Misc/Config.cpp --replace /usr $out
27− substituteInPlace src/Misc/Bank.cpp --replace /usr $out
38+ postPatch = ''
39+ substituteInPlace Misc/Config.cpp --replace /usr $out
40+ substituteInPlace Misc/Bank.cpp --replace /usr $out
2841 '';
2942
30− preConfigure = "cd src";
43+ nativeBuildInputs = [ cmake pkg-config ];
44+
45+ buildInputs = [
46+ alsa-lib
47+ boost
48+ cairo
49+ fftwSinglePrec
50+ fltk
51+ libGLU
52+ libjack2
53+ libsndfile
54+ libXdmcp
55+ lv2
56+ minixml
57+ pcre
58+ readline
59+ xorg.libpthreadstubs
60+ zlib
61+ ];
3162
3263 cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ];
3364
@@ -38,8 +69,8 @@ stdenv.mkDerivation rec {
3869 ZynAddSubFX along with very good Jack and Alsa midi/audio
3970 functionality on Linux
4071 '';
41− homepage = "http://yoshimi.sourceforge.net";
42− license = licenses.gpl2;
72+ homepage = "https://yoshimi.github.io/";
73+ license = licenses.gpl2Plus;
4374 platforms = platforms.linux;
4475 maintainers = [ maintainers.goibhniu ];
4576 };