infra/nonguix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nongnu: bitwig-studio: Fix program crash.

Browse Source 
* nongnu/packages/music.scm (bitwig-studio)[#:patchelf-plan]: Remove
"BitwigAudioEngine-x64-AVX2" and "BitwigAudioEngine-X64-SSE41".
[#:install-plan]: Exclude "BitwigPluginHost-X86-SSE41".
[#:phases]: Add "patch-bitwig-audio-engines" and modify "create-wrapper".
[inputs]: Add "libxcursor".
This commit is contained in:
Sughosha 2023-06-14 06:04:25 +00:00
parent 13c595bcb1
commit d09cd3d9e4
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nongnu/packages/music.scm
View File

@ -132,14 +132,9 @@ comprehensively extended, scripted and modified.")
(list #:patchelf-plan (list #:patchelf-plan
#~`(("opt/bitwig-studio/bitwig-studio" ("libc")) #~`(("opt/bitwig-studio/bitwig-studio" ("libc"))
("opt/bitwig-studio/BitwigStudio" ("libc")) ("opt/bitwig-studio/BitwigStudio" ("libc"))
("opt/bitwig-studio/bin/BitwigAudioEngine-X64-AVX2" ;; Patching "BitwigAudioEngine-X64-AVX2" and
("libc" "libx11" "libxkbcommon" "libxcb" "xcb-util" ;; "BitwigAudioEngine-X64-SSE41" with RUNPATH using
"xcb-util-wm" "alsa-lib" "jack" "pulseaudio" "zlib")) ;; "patchelf --set-rpath" makes them crash.
("opt/bitwig-studio/bin/BitwigAudioEngine-X64-SSE41"
("libc" "libx11" "libxkbcommon" "libxcb" "xcb-util"
"xcb-util-wm" "alsa-lib" "jack" "pulseaudio" "zlib"))
;; TODO: Patch "BitwigPluginHost-x86-SSE41" with "i686-linux"
;; libraries.
("opt/bitwig-studio/bin/BitwigPluginHost-X64-SSE41" ("opt/bitwig-studio/bin/BitwigPluginHost-X64-SSE41"
("libc" "libx11" "libxkbcommon" "libxcb" "xcb-util" ("libc" "libx11" "libxkbcommon" "libxcb" "xcb-util"
"xcb-util-wm")) "xcb-util-wm"))
@ -172,7 +167,8 @@ comprehensively extended, scripted and modified.")
("opt/bitwig-studio/lib/vamp-plugins/transient-detector.so" ("opt/bitwig-studio/lib/vamp-plugins/transient-detector.so"
("libc"))) ("libc")))
#:install-plan #:install-plan
#~`(("opt" "opt") #~`(("opt" "opt"
#:exclude ("BitwigPluginHost-X86-SSE41")) ;no multilib
("usr/share" "share")) ("usr/share" "share"))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
@ -197,6 +193,14 @@ comprehensively extended, scripted and modified.")
"lib/bitwig-studio/libxcb-imdkit.so.1")) "lib/bitwig-studio/libxcb-imdkit.so.1"))
(symlink (string-append #$openjdk17 "/bin/java") (symlink (string-append #$openjdk17 "/bin/java")
"bin/BitwigStudio")))) "bin/BitwigStudio"))))
(add-after 'patchelf 'patch-bitwig-audio-engines
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "opt/bitwig-studio/bin"
(invoke "patchelf" "--set-interpreter"
(string-append (assoc-ref inputs "libc")
"/lib/ld-linux-x86-64.so.2")
"BitwigAudioEngine-X64-AVX2"
"BitwigAudioEngine-X64-SSE41"))))
(add-after 'install 'create-wrapper (add-after 'install 'create-wrapper
(lambda _ (lambda _
(make-wrapper (make-wrapper
@ -205,11 +209,15 @@ comprehensively extended, scripted and modified.")
"/opt/bitwig-studio/bitwig-studio") "/opt/bitwig-studio/bitwig-studio")
#:skip-argument-0? #t #:skip-argument-0? #t
`("PATH" prefix `("PATH" prefix
(,(string-append #$ffmpeg "/lib"))) (,(string-append #$ffmpeg "/bin")))
`("LD_LIBRARY_PATH" ":" suffix `("LD_LIBRARY_PATH" ":" suffix
(,(string-append #$xcb-imdkit "/lib") (,(string-append #$alsa-lib "/lib")
,(string-append #$jack-1 "/lib")
,(string-append #$libusb4java "/lib")
,(string-append #$llvm-13 "/lib") ,(string-append #$llvm-13 "/lib")
,(string-append #$libusb4java "/lib")))))) ,(string-append #$pipewire "/lib")
,(string-append #$pulseaudio "/lib")
,(string-append #$xcb-imdkit "/lib"))))))
(replace 'install-license-files (replace 'install-license-files
(lambda _ (lambda _
(install-file (install-file
@ -229,6 +237,7 @@ comprehensively extended, scripted and modified.")
libusb4java libusb4java
libx11 libx11
libxcb libxcb
libxcursor
libxkbcommon libxkbcommon
llvm-13 llvm-13
mesa mesa