unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sughosha via Guix-patches via <guix-patches@gnu.org>
To: 74723@debbugs.gnu.org
Cc: Sughosha <sughosha@disroot.org>, Gabriel Wicki <gabriel@erlikon.ch>
Subject: [bug#74723] [PATCH 02/19] gnu: carla: Fix making carla executable.
Date: Sat,  7 Dec 2024 17:50:16 +0530	[thread overview]
Message-ID: <ef913683fa90d787138ddd9182a87d10fe9b5654.1733563475.git.sughosha@disroot.org> (raw)
In-Reply-To: <cover.1733563475.git.sughosha@disroot.org>

This commit fixes lmms opening carla.

* gnu/packages/audio.scm (carla)[arguments]<#:phases>: In make-carla-executable
phase, also make carla-control, carla-jack-multi, carla-jack-single,
carla-patchbay and carla-rack executable. In wrap-executables phase, also wrap
the other executables and resources.

Change-Id: I529ccf91d3254bc9e20259460c24a6932654a45e
---
 gnu/packages/audio.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index f842d77031..4864f41223 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5754,13 +5754,32 @@ (define-public carla
                    (invoke "make" "features")))
                (add-after 'install 'make-carla-executable
                  (lambda _
-                   (chmod (string-append #$output "/share/carla/carla") #o555)))
+                   (with-directory-excursion (string-append #$output
+                                                           "/share/carla")
+                     (for-each (lambda (file)
+                               (chmod file #o555))
+                      (list "carla"
+                            "carla-control"
+                            "carla-jack-multi"
+                            "carla-jack-single"
+                            "carla-patchbay"
+                            "carla-rack")))))
                (add-after 'install 'wrap-executables
                  (lambda* (#:key inputs #:allow-other-keys)
-                   (wrap-script (string-append #$output "/bin/carla")
-                                #:guile (search-input-file inputs "bin/guile")
-                                `("GUIX_PYTHONPATH" ":" prefix
-                                  (,(getenv "GUIX_PYTHONPATH")))))))))
+                   (with-directory-excursion #$output
+                     (for-each (lambda (file)
+                                 ;; Wrap only those executable files that other
+                                 ;; programs (e.g. lmms) would call.
+                                 (when (and (executable-file? file)
+                                            (not (symbolic-link? file))
+                                            (not (string-suffix? ".py" file)))
+                                   (wrap-script file
+                                     #:guile (search-input-file inputs
+                                                                "bin/guile")
+                                     `("GUIX_PYTHONPATH" ":" prefix
+                                       (,(getenv "GUIX_PYTHONPATH"))))))
+                    (append (find-files "bin")
+                            (find-files "share/carla/resources")))))))))
     (inputs
      (list alsa-lib
            ffmpeg
-- 
2.46.0





  parent reply	other threads:[~2024-12-07 12:25 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-07 12:07 [bug#74723] [PATCH 00/19] gnu: lmms, carla: New features, fixes and updates Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 01/19] gnu: lmms: Fix building carla plugins Sughosha via Guix-patches via
2024-12-07 12:20 ` Sughosha via Guix-patches via [this message]
2024-12-07 12:20 ` [bug#74723] [PATCH 03/19] gnu: lmms: Enable libsoundio and PulseAudio support Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 04/19] gnu: carla: Enable " Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 05/19] gnu: lmms: Enable MP3 file format support for project export Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 06/19] gnu: carla: Add native-search-paths Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 07/19] gnu: Add stk Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 08/19] gnu: lmms: Enable Stk Mallets and GIG Player Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 09/19] gnu: lmms: Enable Wayland support Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 10/19] gnu: carla: " Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 11/19] gnu: Add ringbuffer Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 12/19] gnu: Add libbinio Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 13/19] gnu: Add adplug Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 14/19] gnu: Add exprtk Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 15/19] gnu: carla: Update to 2.5.9 Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 16/19] gnu: Add carla-2.4 Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 17/19] gnu: lmms: Replace carla with carla-2.4 Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 18/19] gnu: Add lmms-1.3 Sughosha via Guix-patches via
2024-12-07 12:20 ` [bug#74723] [PATCH 19/19] gnu: carla-2.6: Update to 2.6.0-1.17000e7 Sughosha via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ef913683fa90d787138ddd9182a87d10fe9b5654.1733563475.git.sughosha@disroot.org \
    --to=guix-patches@gnu.org \
    --cc=74723@debbugs.gnu.org \
    --cc=gabriel@erlikon.ch \
    --cc=sughosha@disroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).