From cec067297020293aea1c39ca44d4b87f18b1e894 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Sat, 20 May 2023 10:46:30 +0000 Subject: [PATCH] nongnu: bitwig-studio: Unbundle libusb4java and add supported-systems. * nongnu/packages/music.scm (bitwig-studio) [#:patchelf-plan]: Remove "lubusb4java.so". [#:phases]: Unbundle "libusb4java.so". [inputs]: Add libusb4java. [supported-systems]: Add "x86_64-linux". --- nongnu/packages/music.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nongnu/packages/music.scm b/nongnu/packages/music.scm index ccf4ab7..fbb2e63 100644 --- a/nongnu/packages/music.scm +++ b/nongnu/packages/music.scm @@ -15,6 +15,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages java) + #:use-module (gnu packages libusb) #:use-module (gnu packages llvm) #:use-module (gnu packages linux) #:use-module (gnu packages pulseaudio) @@ -168,9 +169,6 @@ comprehensively extended, scripted and modified.") ("opt/bitwig-studio/lib/bitwig-studio/libx11-windowing-system.so" ("libc" "mesa" "libxkbcommon" "libxcb" "libxcursor" "libx11" "xcb-util-wm" "xcb-imdkit" "freetype" "cairo")) - ;; FIXME: Package "usb4java" and unbundle it. - ("opt/bitwig-studio/lib/cp/org/usb4java/linux-x86-64/libusb4java.so" - ("libc")) ("opt/bitwig-studio/lib/vamp-plugins/transient-detector.so" ("libc"))) #:install-plan @@ -187,7 +185,9 @@ comprehensively extended, scripted and modified.") (add-after 'unpack 'unbundle-deps (lambda _ (with-directory-excursion "opt/bitwig-studio" - (delete-file-recursively "lib/jre") + (with-directory-excursion "lib" + (for-each delete-file-recursively + (list "cp" "jre"))) (for-each delete-file (list "bin/BitwigStudio" "bin/ffmpeg" @@ -208,7 +208,8 @@ comprehensively extended, scripted and modified.") (,(string-append #$ffmpeg "/lib"))) `("LD_LIBRARY_PATH" ":" suffix (,(string-append #$xcb-imdkit "/lib") - ,(string-append #$llvm-13 "/lib")))))) + ,(string-append #$llvm-13 "/lib") + ,(string-append #$libusb4java "/lib")))))) (replace 'install-license-files (lambda _ (install-file @@ -225,6 +226,7 @@ comprehensively extended, scripted and modified.") glib gtk+ jack-1 + libusb4java libx11 libxcb libxkbcommon