GNU bug report logs - #52247
[PATCH] gnu: shotcut: Find ffmpeg and mlt at runtime.

Previous Next

Full log

View this message in rfc822 format

From: Vinicius Monego <monego <at> posteo.net>
To: 52247 <at> debbugs.gnu.org
Cc: Vinicius Monego <monego <at> posteo.net>
Subject: [bug#52247] [PATCH v2 2/2] gnu: shotcut: Adjust environment variables in 'wrap-program.
Date: Sat, 18 Dec 2021 18:12:27 +0000

* gnu/packages/video.scm (shotcut)[arguments]<#:phases>: In the 'wrap-program
phase, wrap LADSPA_PATH, don't wrap MLT_PREFIX, remove trailing slash from
FREI0R_PATH, remove ffmpeg and add mlt to PATH.
---
 gnu/packages/video.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 9b5738358b..30d6341c59 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4844,18 +4844,19 @@ transitions, and effects and then export your film to many common formats.")
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (frei0r (assoc-ref inputs "frei0r-plugins"))
-                    (ffmpeg (assoc-ref inputs "ffmpeg"))
                     (jack (assoc-ref inputs "jack"))
+                    (ladspa (assoc-ref inputs "ladspa"))
+                    (mlt (assoc-ref inputs "mlt"))
                     (sdl2 (assoc-ref inputs "sdl2")))
                (wrap-program (string-append out "/bin/shotcut")
-                 `("PATH" ":" prefix
-                   ,(list (string-append ffmpeg "/bin")))
+                 `("FREI0R_PATH" ":" =
+                   (,(string-append frei0r "/lib/frei0r-1")))
+                 `("LADSPA_PATH" ":" =
+                   (,(string-append ladspa "/lib/ladspa")))
                  `("LD_LIBRARY_PATH" ":" prefix
                    ,(list (string-append jack "/lib" ":" sdl2 "/lib")))
-                 `("FREI0R_PATH" ":" =
-                   (,(string-append frei0r "/lib/frei0r-1/")))
-                 `("MLT_PREFIX" ":" =
-                   (,(assoc-ref inputs "mlt"))))))))))
+                 `("PATH" ":" prefix
+                   ,(list (string-append mlt "/bin"))))))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)
-- 
2.30.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.