From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GNR7JPYkvmHTkwAAgWs5BA (envelope-from ) for ; Sat, 18 Dec 2021 19:14:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id EBU9IPYkvmHsKAAA1q6Kng (envelope-from ) for ; Sat, 18 Dec 2021 18:14:14 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4843813F88 for ; Sat, 18 Dec 2021 19:14:14 +0100 (CET) Received: from localhost ([::1]:46378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myeDl-0006FR-F9 for larch@yhetil.org; Sat, 18 Dec 2021 13:14:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myeDa-0006EZ-Mw for guix-patches@gnu.org; Sat, 18 Dec 2021 13:14:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60481) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myeDa-00013v-EQ for guix-patches@gnu.org; Sat, 18 Dec 2021 13:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myeDa-0006qE-9f for guix-patches@gnu.org; Sat, 18 Dec 2021 13:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52247] [PATCH v2 2/2] gnu: shotcut: Adjust environment variables in 'wrap-program. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 18:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52247 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52247@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 52247-submit@debbugs.gnu.org id=B52247.163985118226210 (code B ref 52247); Sat, 18 Dec 2021 18:14:02 +0000 Received: (at 52247) by debbugs.gnu.org; 18 Dec 2021 18:13:02 +0000 Received: from localhost ([127.0.0.1]:43793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myeCY-0006o4-5J for submit@debbugs.gnu.org; Sat, 18 Dec 2021 13:13:02 -0500 Received: from mout02.posteo.de ([185.67.36.66]:52695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myeCW-0006nc-Im for 52247@debbugs.gnu.org; Sat, 18 Dec 2021 13:12:57 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 28B2F240106 for <52247@debbugs.gnu.org>; Sat, 18 Dec 2021 19:12:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639851170; bh=d6aOIr2/5X/UKgxh4MQzh8EK9Q1K3lEEuU6UFsgSUCY=; h=From:To:Cc:Subject:Date:From; b=NEe3PCucXRrDguia8BmXe69WjLGugWllK+AHlc25LOyx6yvyLiKDWEQ8nE3d92zHw 5bwXgiwNppq0NZqN4htkGAncKFFulNDZxTP1xWAb4BaNNh5xoN9WaEsWayR79tKwYH 83uLKMcwrH0S5EeDyyUpQvUcQayWIUhX/3WlQstt86ITlQQMmrNyteMQ7NAYv+y7xL BGsv8Ohexf4bLJHKAbxI3CVZat0gCmuUFAFYkYvKHRwJyiLGDs5ndnsdKStOM6pEqy FBZr7emIoP+/5l61TjM8DZzPp0tnJkaWKI1xb1jrh0WnmKgA9NzGbsxMSnC49FU8Bb b9U+5po3l9TmQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGYqN4Km5z9rxL; Sat, 18 Dec 2021 19:12:48 +0100 (CET) From: Vinicius Monego Date: Sat, 18 Dec 2021 18:12:27 +0000 Message-Id: <20211218181227.82026-2-monego@posteo.net> In-Reply-To: <20211218181227.82026-1-monego@posteo.net> References: <20211218181227.82026-1-monego@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1639851254; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=N9qKKCOgkkPvMGhsQap6s4Kcn/RA9EyPInSO6qlbO3k=; b=X2TpYFcDP8Twhuw5lJQ/EZC/gp52G0X4f6sAvlzGTcM6PN6K0LF5DBJq8yI6Sbh6jGZynA gVx1JWOV2UV/O4G/q2dQXnmO4xxfBo459XKZjMm6UqpkUz8i0g5m/jcOORn3QavoO2PN5/ uNerAgej18vnvTZy+g9OQ77imctC5LZ0BIHOjW//HZYdn4ygCQN0swXa8D6MSRSDDxHSvw 5FBUBQGDw17qzVqWiNyVka5ia3a3fYMsGqpADyL2S3rmd0Oz/v+Aoq3fD5mzj7cYla2NAE qlE8Z/RmxmnY8BwYFogLrLx+FOdBciHT1240rmCMm7nC/su74/jGswVYqsaIxQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1639851254; a=rsa-sha256; cv=none; b=YIlHqmAPBqXZ3VFIHTZqxriHRHhW5mivstOuJaVWTbUR62bjbtQn9cZ9nGS9jnQOD8himF Av6jmWAJk8uRkCCaRqdLbeBbUuh6veeotZBfCsN/LPJdmXNMDUc/RWYUZWhZlNWWvjmI0r aaoLPs5Q3Ez8h3lfiiTprEJthWAybxGHvcZuTQExqltqjXcLTBvqhzuHsju9gJueoPYIN6 mW+OvYd8OuGr5X6rke+VBPuDG5XdtKSdEezYCHLUgdoUsOP15Zw6i/bBfIpqplaOXMaloO KWoIqwebKpoVq8FbrfByvlcHeeEIU6N4EtF2bvfkDkq/NbXcF0nBU2PEqWuhbw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=NEe3PCuc; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.91 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=NEe3PCuc; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 4843813F88 X-Spam-Score: -0.91 X-Migadu-Scanner: scn0.migadu.com X-TUID: BSJ7J4b5k1pR * 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