Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1--- 2 easy_abc.py | 4 ++++ 3 fluidsynth.py | 2 ++ 4 2 files changed, 6 insertions(+) 5 6diff --git a/easy_abc.py b/easy_abc.py 7index 5be3e6a..40c999a 100644 8--- a/easy_abc.py 9+++ b/easy_abc.py 10@@ -3960,6 +3960,8 @@ class MainFrame(wx.Frame): 11 else: 12 default_soundfont_path = '/usr/share/sounds/sf2/FluidR3_GM.sf2' 13 14+ default_soundfont_path = '@soundfont@' 15+ 16 soundfont_path = settings.get('soundfont_path', default_soundfont_path) 17 self.uses_fluidsynth = False 18 if fluidsynth_available and soundfont_path and os.path.exists(soundfont_path): 19@@ -8367,6 +8369,8 @@ class MainFrame(wx.Frame): 20 gs_path = '/usr/bin/pstopdf' 21 settings['gs_path'] = gs_path 22 23+ settings['gs_path'] = '@ghostscript@' 24+ 25 # 1.3.6.1 [SS] 2015-01-12 2015-01-22 26 gs_path = settings['gs_path'] #eliminate trailing \n 27 if gs_path and (os.path.exists(gs_path) == False): 28diff --git a/fluidsynth.py b/fluidsynth.py 29index 529ebbf..b5d9377 100644 30--- a/fluidsynth.py 31+++ b/fluidsynth.py 32@@ -44,6 +44,8 @@ if platform.system() == 'Windows': 33 else: 34 lib_locations = ['./libfluidsynth.so.3', 'libfluidsynth.so.3', './libfluidsynth.so.2', 'libfluidsynth.so.2'] 35 36+lib_locations = ['@fluidsynth@'] 37+ 38 i = 0 39 while i < len(lib_locations): 40 try: 41-- 422.38.5 43