commit 334ffa5d9780b91181160027bb19a9c907e182b2 · pyrox.dev/nixpkgs

+6

pkgs/applications/audio/zynaddsubfx/ZynLogo.svg

··· 1 + <svg viewBox="64 60 33 33" xmlns="http://www.w3.org/2000/svg"> 2 + <polygon points="97 64 64 61 67.3 63.3 64 63 87 79 97 66 95.6 65.9" fill="#2E3239"/> 3 + <polygon points="97 90 74 74 64 87 65.4 87.1 64 89 97 92 93.7 89.7" fill="#2E3239"/> 4 + <polygon points="64 62 97 65 87 78" fill="#50C3C7"/> 5 + <polygon points="97 91 64 88 74 75" fill="#57C1A6"/> 6 + </svg>

+44 -19

pkgs/applications/audio/zynaddsubfx/default.nix

··· 15 15 , zlib 16 16 17 17 # Optional dependencies 18 - , alsaSupport ? true 18 + , alsaSupport ? stdenv.isLinux 19 19 , alsa-lib 20 20 , dssiSupport ? false 21 21 , dssi ··· 27 27 , ossSupport ? true 28 28 , portaudioSupport ? true 29 29 , portaudio 30 + , sndioSupport ? stdenv.isOpenBSD 31 + , sndio 30 32 31 33 # Optional GUI dependencies 32 34 , guiModule ? "off" 33 35 , cairo 34 - , fltk13 36 + , fltk 35 37 , libGL 36 38 , libjpeg 37 39 , libX11 ··· 40 42 41 43 # Test dependencies 42 44 , cxxtest 45 + , ruby 43 46 }: 44 47 45 48 assert builtins.any (g: guiModule == g) [ "fltk" "ntk" "zest" "off" ]; ··· 50 53 "ntk" = "NTK"; 51 54 "zest" = "Zyn-Fusion"; 52 55 }.${guiModule}; 56 + 53 57 mruby-zest = callPackage ./mruby-zest { }; 54 58 in stdenv.mkDerivation rec { 55 59 pname = "zynaddsubfx"; 56 - version = "3.0.5"; 60 + version = "3.0.6"; 57 61 58 62 src = fetchFromGitHub { 59 63 owner = pname; 60 64 repo = pname; 61 - rev = version; 62 - sha256 = "1vh1gszgjxwn8m32rk5222z1j2cnjax0bqpag7b47v6i36p2q4x8"; 65 + rev = "refs/tags/${version}"; 63 66 fetchSubmodules = true; 67 + sha256 = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg="; 64 68 }; 69 + 70 + outputs = [ "out" "doc" ]; 65 71 66 72 postPatch = '' 73 + patchShebangs rtosc/test/test-port-checker.rb src/Tests/check-ports.rb 67 74 substituteInPlace src/Misc/Config.cpp --replace /usr $out 68 75 ''; 69 76 ··· 75 82 ++ lib.optionals jackSupport [ libjack2 ] 76 83 ++ lib.optionals lashSupport [ lash ] 77 84 ++ lib.optionals portaudioSupport [ portaudio ] 78 - ++ lib.optionals (guiModule == "fltk") [ fltk13 libjpeg libXpm ] 85 + ++ lib.optionals sndioSupport [ sndio ] 86 + ++ lib.optionals (guiModule == "fltk") [ fltk libjpeg libXpm ] 79 87 ++ lib.optionals (guiModule == "ntk") [ ntk cairo libXpm ] 80 88 ++ lib.optionals (guiModule == "zest") [ libGL libX11 ]; 81 89 ··· 87 95 ++ lib.optional (guiModule == "fltk") "-DFLTK_SKIP_OPENGL=ON"; 88 96 89 97 doCheck = true; 90 - checkInputs = [ cxxtest ]; 98 + checkInputs = [ cxxtest ruby ]; 91 99 92 100 # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 93 101 checkPhase = let 94 - # Tests fail on aarch64 95 - disabledTests = lib.optionals stdenv.isAarch64 [ 96 - "MessageTest" 97 - "UnisonTest" 98 - ]; 102 + disabledTests = 103 + # PortChecker test fails when lashSupport is enabled because 104 + # zynaddsubfx takes to long to start trying to connect to lash 105 + lib.optionals lashSupport [ "PortChecker" ] 106 + 107 + # Tests fail on aarch64 108 + ++ lib.optionals stdenv.isAarch64 [ "MessageTest" "UnisonTest" ]; 99 109 in '' 100 110 runHook preCheck 101 111 ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' 102 112 runHook postCheck 103 113 ''; 104 114 115 + # Use Zyn-Fusion logo for zest build 116 + # An SVG version of the logo isn't hosted anywhere we can fetch, I 117 + # had to manually derive it from the code that draws it in-app: 118 + # https://github.com/mruby-zest/mruby-zest-build/blob/3.0.6/src/mruby-zest/example/ZynLogo.qml#L65-L97 119 + postInstall = lib.optionalString (guiModule == "zest") '' 120 + rm -r "$out/share/pixmaps" 121 + mkdir -p "$out/share/icons/hicolor/scalable/apps" 122 + cp ${./ZynLogo.svg} "$out/share/icons/hicolor/scalable/apps/zynaddsubfx.svg" 123 + ''; 124 + 105 125 # When building with zest GUI, patch plugins 106 126 # and standalone executable to properly locate zest 107 127 postFixup = lib.optionalString (guiModule == "zest") '' 108 - patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so")" \ 109 - "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so" 110 - 111 - patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/vst/ZynAddSubFX.so")" \ 112 - "$out/lib/vst/ZynAddSubFX.so" 128 + for lib in "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so" "$out/lib/vst/ZynAddSubFX.so"; do 129 + patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$lib")" "$lib" 130 + done 113 131 114 132 wrapProgram "$out/bin/zynaddsubfx" \ 115 133 --prefix PATH : ${mruby-zest} \ ··· 123 141 then "https://zynaddsubfx.sourceforge.io/zyn-fusion.html" 124 142 else "https://zynaddsubfx.sourceforge.io"; 125 143 126 - license = licenses.gpl2; 144 + license = licenses.gpl2Plus; 127 145 maintainers = with maintainers; [ goibhniu kira-bruneau ]; 128 - platforms = platforms.linux; 146 + platforms = platforms.all; 147 + 148 + # On macOS: 149 + # - Tests don't compile (ld: unknown option: --no-as-needed) 150 + # - ZynAddSubFX LV2 & VST plugin fail to compile (not setup to use ObjC version of pugl) 151 + # - TTL generation crashes (`pointer being freed was not allocated`) for all VST plugins using AbstractFX 152 + # - Zest UI fails to start on pulg_setup: Could not open display, aborting. 153 + broken = stdenv.isDarwin; 129 154 }; 130 155 }

+29 -75

pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix

··· 1 - { lib, stdenv 1 + { lib 2 + , stdenv 2 3 , fetchFromGitHub 3 - , fetchpatch 4 4 , bison 5 - , git 6 - , python2 5 + , pkg-config 7 6 , rake 8 7 , ruby 9 8 , libGL ··· 11 10 , libX11 12 11 }: 13 12 14 - let 15 - mgem-list = fetchFromGitHub { 16 - owner = "mruby"; 17 - repo = "mgem-list"; 18 - rev = "2033837203c8a141b1f9d23bb781fe0cbaefbd24"; 19 - sha256 = "0igf2nsx5i6g0yf7sjxxkngyriv213d0sjs3yidrflrabiywpxmm"; 20 - }; 21 - 22 - mruby-dir = fetchFromGitHub { 23 - owner = "iij"; 24 - repo = "mruby-dir"; 25 - rev = "89dceefa1250fb1ae868d4cb52498e9e24293cd1"; 26 - sha256 = "0zrhiy9wmwmc9ls62iyb2z86j2ijqfn7rn4xfmrbrfxygczarsm9"; 27 - }; 28 - 29 - mruby-errno = fetchFromGitHub { 30 - owner = "iij"; 31 - repo = "mruby-errno"; 32 - rev = "b4415207ff6ea62360619c89a1cff83259dc4db0"; 33 - sha256 = "12djcwjjw0fygai5kssxbfs3pzh3cpnq07h9m2h5b51jziw380xj"; 34 - }; 35 - 36 - mruby-file-stat = fetchFromGitHub { 37 - owner = "ksss"; 38 - repo = "mruby-file-stat"; 39 - rev = "aa474589f065c71d9e39ab8ba976f3bea6f9aac2"; 40 - sha256 = "1clarmr67z133ivkbwla1a42wcjgj638j9w0mlv5n21mhim9rid5"; 41 - }; 42 - 43 - mruby-process = fetchFromGitHub { 44 - owner = "iij"; 45 - repo = "mruby-process"; 46 - rev = "fe171fbe2a6cc3c2cf7d713641bddde71024f7c8"; 47 - sha256 = "00yrzc371f90gl5m1gbkw0qq8c394bpifssjr8p1wh5fmzhxqyml"; 48 - }; 49 - 50 - mruby-pack = fetchFromGitHub { 51 - owner = "iij"; 52 - repo = "mruby-pack"; 53 - rev = "383a9c79e191d524a9a2b4107cc5043ecbf6190b"; 54 - sha256 = "003glxgxifk4ixl12sy4gn9bhwvgb79b4wga549ic79isgv81w2d"; 55 - }; 56 - in 57 13 stdenv.mkDerivation rec { 58 14 pname = "mruby-zest"; 59 - version = "3.0.5"; 15 + version = "3.0.6"; 60 16 61 17 src = fetchFromGitHub { 62 18 owner = pname; 63 19 repo = "${pname}-build"; 64 - rev = version; 65 - sha256 = "0fxljrgamgz2rm85mclixs00b0f2yf109jc369039n1vf0l5m57d"; 20 + rev = "refs/tags/${version}"; 66 21 fetchSubmodules = true; 22 + sha256 = "sha256-rIb6tQimwrUj+623IU5zDyKNWsNYYBElLQClOsP+5Dc="; 67 23 }; 68 - 69 - nativeBuildInputs = [ bison git python2 rake ruby ]; 70 - buildInputs = [ libGL libuv libX11 ]; 71 24 72 25 patches = [ 73 - ./force-gcc-as-linker.patch 74 - ./system-libuv.patch 26 + ./force-cxx-as-linker.patch 27 + ]; 75 28 76 - # Pull upstream fix for -fno-common toolchains: 77 - # https://github.com/mruby-zest/mruby-zest-build/issues/25 78 - (fetchpatch { 79 - name = "fno-common.patch"; 80 - url = "https://github.com/mruby-zest/mruby-zest-build/commit/4eb88250f22ee684acac95d4d1f114df504e37a7.patch"; 81 - sha256 = "0wg7qy1vg0mzcxagf35bv35dlr0q17pxjicigpf86yqppvgrzrsb"; 82 - }) 29 + nativeBuildInputs = [ 30 + bison 31 + pkg-config 32 + rake 33 + ruby 83 34 ]; 84 35 85 - # Add missing dependencies of deps/mruby-dir-glob/mrbgem.rake 86 - # Should be fixed in next release, see bcadb0a5490bd6d599f1a0e66ce09b46363c9dae 87 - postPatch = '' 88 - mkdir -p mruby/build/mrbgems 89 - ln -s ${mgem-list} mruby/build/mrbgems/mgem-list 90 - ln -s ${mruby-dir} mruby/build/mrbgems/mruby-dir 91 - ln -s ${mruby-errno} mruby/build/mrbgems/mruby-errno 92 - ln -s ${mruby-file-stat} mruby/build/mrbgems/mruby-file-stat 93 - ln -s ${mruby-process} mruby/build/mrbgems/mruby-process 94 - ln -s ${mruby-pack} mruby/build/mrbgems/mruby-pack 36 + buildInputs = [ 37 + libGL 38 + libuv 39 + libX11 40 + ]; 41 + 42 + # Force optimization to fix: 43 + # warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) 44 + NIX_CFLAGS_COMPILE = "-O3"; 45 + 46 + # Remove pre-built y.tab.c to generate with nixpkgs bison 47 + preBuild = '' 48 + rm mruby/mrbgems/mruby-compiler/core/y.tab.c 95 49 ''; 96 50 97 51 installTargets = [ "pack" ]; ··· 102 56 103 57 # mruby-widget-lib/src/api.c requires MainWindow.qml as part of a 104 58 # sanity check, even though qml files are compiled into the binary 105 - # https://github.com/mruby-zest/mruby-zest-build/tree/3.0.5/src/mruby-widget-lib/src/api.c#L99-L116 106 - # https://github.com/mruby-zest/mruby-zest-build/tree/3.0.5/linux-pack.sh#L17-L18 59 + # https://github.com/mruby-zest/mruby-zest-build/blob/3.0.6/src/mruby-widget-lib/src/api.c#L107-L124 60 + # https://github.com/mruby-zest/mruby-zest-build/blob/3.0.6/linux-pack.sh#L17-L18 107 61 mkdir -p "$out/qml" 108 62 touch "$out/qml/MainWindow.qml" 109 63 ''; ··· 111 65 meta = with lib; { 112 66 description = "The Zest Framework used in ZynAddSubFX's UI"; 113 67 homepage = "https://github.com/mruby-zest"; 114 - license = licenses.lgpl21; 68 + license = licenses.lgpl21Plus; 115 69 maintainers = with maintainers; [ kira-bruneau ]; 116 70 platforms = platforms.all; 117 71 };

+13

pkgs/applications/audio/zynaddsubfx/mruby-zest/force-cxx-as-linker.patch

··· 1 + diff --git a/mruby/tasks/toolchains/gcc.rake b/mruby/tasks/toolchains/gcc.rake 2 + index 51bda6517..9bc96d0e2 100644 3 + --- a/mruby/tasks/toolchains/gcc.rake 4 + +++ b/mruby/tasks/toolchains/gcc.rake 5 + @@ -23,7 +23,7 @@ MRuby::Toolchain.new(:gcc) do |conf, params| 6 + end 7 + 8 + conf.linker do |linker| 9 + - linker.command = ENV['LD'] || ENV['CXX'] || ENV['CC'] || default_command 10 + + linker.command = ENV['CXX'] || ENV['CC'] || default_command 11 + linker.flags = [ENV['LDFLAGS'] || %w()] 12 + linker.libraries = %w(m) 13 + linker.library_paths = []

-13

pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch

··· 1 - diff --git a/mruby/tasks/toolchains/gcc.rake b/mruby/tasks/toolchains/gcc.rake 2 - index f370c0ab..e5ab9f60 100644 3 - --- a/mruby/tasks/toolchains/gcc.rake 4 - +++ b/mruby/tasks/toolchains/gcc.rake 5 - @@ -22,7 +22,7 @@ MRuby::Toolchain.new(:gcc) do |conf, _params| 6 - end 7 - 8 - conf.linker do |linker| 9 - - linker.command = ENV['LD'] || 'gcc' 10 - + linker.command = 'gcc' 11 - linker.flags = [ENV['LDFLAGS'] || %w()] 12 - linker.libraries = %w(m) 13 - linker.library_paths = []

-113

pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch

··· 1 - diff --git a/Makefile b/Makefile 2 - index f3e3be2..2398852 100644 3 - --- a/Makefile 4 - +++ b/Makefile 5 - @@ -1,8 +1,3 @@ 6 - -UV_DIR = libuv-v1.9.1 7 - -UV_FILE = $(UV_DIR).tar.gz 8 - -UV_URL = http://dist.libuv.org/dist/v1.9.1/$(UV_FILE) 9 - - 10 - - 11 - all: 12 - ruby ./rebuild-fcache.rb 13 - cd deps/nanovg/src && $(CC) nanovg.c -c -fPIC 14 - @@ -10,12 +5,12 @@ all: 15 - # cd deps/pugl && python2 ./waf configure --no-cairo --static 16 - cd deps/pugl && python2 ./waf configure --no-cairo --static --debug 17 - cd deps/pugl && python2 ./waf 18 - - cd src/osc-bridge && CFLAGS="-I ../../deps/$(UV_DIR)/include " make lib 19 - + cd src/osc-bridge && make lib 20 - cd mruby && MRUBY_CONFIG=../build_config.rb rake 21 - $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ 22 - ./deps/libnanovg.a \ 23 - src/osc-bridge/libosc-bridge.a \ 24 - - ./deps/$(UV_DIR)/.libs/libuv.a -lm -lX11 -lGL -lpthread 25 - + -luv -lm -lX11 -lGL -lpthread 26 - $(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 27 - 28 - osx: 29 - @@ -25,12 +20,12 @@ osx: 30 - cd deps/pugl && python2 ./waf configure --no-cairo --static 31 - # cd deps/pugl && python2 ./waf configure --no-cairo --static --debug 32 - cd deps/pugl && python2 ./waf 33 - - cd src/osc-bridge && CFLAGS="-I ../../deps/$(UV_DIR)/include " make lib 34 - + cd src/osc-bridge && make lib 35 - cd mruby && MRUBY_CONFIG=../build_config.rb rake 36 - $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ 37 - ./deps/libnanovg.a \ 38 - src/osc-bridge/libosc-bridge.a \ 39 - - ./deps/$(UV_DIR)/.libs/libuv.a -lm -framework OpenGL -lpthread 40 - + -luv -lm -framework OpenGL -lpthread 41 - $(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -framework OpenGL -framework AppKit -lpthread -I deps/pugl -std=gnu99 42 - 43 - windows: 44 - @@ -38,38 +33,14 @@ windows: 45 - $(AR) rc deps/libnanovg.a deps/nanovg/src/*.o 46 - cd deps/pugl && CFLAGS="-mstackrealign" python2 ./waf configure --no-cairo --static --target=win32 47 - cd deps/pugl && python2 ./waf 48 - - cd src/osc-bridge && CFLAGS="-mstackrealign -I ../../deps/$(UV_DIR)/include " make lib 49 - + cd src/osc-bridge && CFLAGS="-mstackrealign" make lib 50 - cd mruby && WINDOWS=1 MRUBY_CONFIG=../build_config.rb rake 51 - $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f | grep -e "\.o$$" | grep -v bin` \ 52 - ./deps/libnanovg.a \ 53 - src/osc-bridge/libosc-bridge.a \ 54 - - ./deps/libuv-win.a \ 55 - - -lm -lpthread -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 56 - + -luv -lm -lpthread -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 57 - $(CC) -mstackrealign -DWIN32 test-libversion.c deps/pugl/build/libpugl-0.a -o zest.exe -lpthread -I deps/pugl -std=c99 -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 58 - 59 - - 60 - -builddep: deps/libuv.a 61 - -deps/libuv.a: 62 - - cd deps/$(UV_DIR) && ./autogen.sh 63 - - cd deps/$(UV_DIR) && CFLAGS=-fPIC ./configure 64 - - cd deps/$(UV_DIR) && CFLAGS=-fPIC make 65 - - cp deps/$(UV_DIR)/.libs/libuv.a deps/ 66 - - 67 - -builddepwin: deps/libuv-win.a 68 - -deps/libuv-win.a: 69 - - cd deps/$(UV_DIR) && ./autogen.sh 70 - - cd deps/$(UV_DIR) && CFLAGS="-mstackrealign" ./configure --host=x86_64-w64-mingw32 71 - - cd deps/$(UV_DIR) && LD=x86_64-w64-mingw32-gcc make 72 - - cp deps/$(UV_DIR)/.libs/libuv.a deps/libuv-win.a 73 - - 74 - -deps/$(UV_DIR): 75 - - cd deps && wget -4 $(UV_URL) && tar xvf $(UV_FILE) 76 - -setup: deps/$(UV_DIR) 77 - - 78 - -setupwin: 79 - - cd deps && wget -4 $(UV_URL) 80 - - cd deps && tar xvf $(UV_FILE) 81 - - 82 - push: 83 - cd src/osc-bridge && git push 84 - cd src/mruby-qml-parse && git push 85 - diff --git a/build_config.rb b/build_config.rb 86 - index 00f1f69..11ac15b 100644 87 - --- a/build_config.rb 88 - +++ b/build_config.rb 89 - @@ -96,7 +96,6 @@ build_type.new(build_name) do |conf| 90 - conf.cc do |cc| 91 - cc.include_paths << "#{`pwd`.strip}/../deps/nanovg/src" 92 - cc.include_paths << "#{`pwd`.strip}/../deps/pugl/" 93 - - cc.include_paths << "#{`pwd`.strip}/../deps/libuv-v1.9.1/include/" 94 - cc.include_paths << "/usr/share/mingw-w64/include/" if windows 95 - cc.include_paths << "/usr/x86_64-w64-mingw32/include/" if windows 96 - cc.flags << "-DLDBL_EPSILON=1e-6" if windows 97 - @@ -117,14 +116,14 @@ build_type.new(build_name) do |conf| 98 - linker.flags_after_libraries << "#{`pwd`.strip}/../deps/pugl/build/libpugl-0.a" 99 - linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libnanovg.a" 100 - if(!windows) 101 - - linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv.a" 102 - + linker.flags_after_libraries << "-luv" 103 - if(ENV['OS'] != "Mac") 104 - linker.libraries << 'GL' 105 - linker.libraries << 'X11' 106 - end 107 - linker.flags_after_libraries << "-lpthread -ldl -lm" 108 - else 109 - - linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv-win.a" 110 - + linker.flags_after_libraries << "-luv" 111 - linker.flags_after_libraries << "-lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi" 112 - linker.flags_after_libraries << "-lglu32 -lgdi32 -lopengl32" 113 - end

+1

pkgs/top-level/aliases.nix

··· 1648 1648 torchat = throw "torchat was removed because it was broken and requires Python 2"; # added 2022-06-05 1649 1649 ttyrec = ovh-ttyrec; # Added 2021-01-02 1650 1650 zplugin = zinit; # Added 2021-01-30 1651 + zyn-fusion = zynaddsubfx; # Added 2022-08-05 1651 1652 1652 1653 inherit (stdenv.hostPlatform) system; # Added 2021-10-22 1653 1654

+6 -7

pkgs/top-level/all-packages.nix

··· 31953 31953 31954 31954 inherit (nodePackages) zx; 31955 31955 31956 - zynaddsubfx = zyn-fusion; 31956 + zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { 31957 + guiModule = "zest"; 31958 + fftw = fftwSinglePrec; 31959 + }; 31957 31960 31958 - zynaddsubfx-fltk = callPackage ../applications/audio/zynaddsubfx { 31961 + zynaddsubfx-fltk = zynaddsubfx.override { 31959 31962 guiModule = "fltk"; 31960 31963 }; 31961 31964 31962 - zynaddsubfx-ntk = callPackage ../applications/audio/zynaddsubfx { 31965 + zynaddsubfx-ntk = zynaddsubfx.override { 31963 31966 guiModule = "ntk"; 31964 - }; 31965 - 31966 - zyn-fusion = callPackage ../applications/audio/zynaddsubfx { 31967 - guiModule = "zest"; 31968 31967 }; 31969 31968 31970 31969 ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS