From patchwork Fri Dec 13 13:05:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 16502 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A98B2178B4; Fri, 13 Dec 2019 13:09:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 69C90178A5 for ; Fri, 13 Dec 2019 13:09:38 +0000 (GMT) Received: from localhost ([::1]:49084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifkhN-0003Bu-Op for patchwork@mira.cbaines.net; Fri, 13 Dec 2019 08:09:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53823) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifket-0008IX-Cb for guix-patches@gnu.org; Fri, 13 Dec 2019 08:07:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifkes-0008PE-7m for guix-patches@gnu.org; Fri, 13 Dec 2019 08:07:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55446) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifkes-0008Ol-3f for guix-patches@gnu.org; Fri, 13 Dec 2019 08:07:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ifker-0000w0-VA for guix-patches@gnu.org; Fri, 13 Dec 2019 08:07:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38590] [PATCH] gnu: emacs-telega: Don't propagate ffmpeg. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Dec 2019 13:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38590 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38590@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15762423723536 (code B ref -1); Fri, 13 Dec 2019 13:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Dec 2019 13:06:12 +0000 Received: from localhost ([127.0.0.1]:33186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ifke1-0000ut-2p for submit@debbugs.gnu.org; Fri, 13 Dec 2019 08:06:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:35740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ifkdw-0000ui-IJ for submit@debbugs.gnu.org; Fri, 13 Dec 2019 08:06:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44614) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifkdu-00073k-6u for guix-patches@gnu.org; Fri, 13 Dec 2019 08:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifkdo-0006ig-9F for guix-patches@gnu.org; Fri, 13 Dec 2019 08:05:57 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:5841) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ifkdl-0006Sn-18 for guix-patches@gnu.org; Fri, 13 Dec 2019 08:05:54 -0500 Received: from localhost.localdomain (213-240-64-42.hdsl.highway.telekom.at [213.240.64.42]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 47Z9rh0sdyz1LgFR for ; Fri, 13 Dec 2019 14:05:39 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 47Z9rh0sdyz1LgFR DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1576242340; bh=KhEe/jhCgfvOQ84XXcZOW5VdDaADxY9I6FKx4ftD600=; h=From:To:Subject:Date:From; b=QpDQxtK5Bk3XM1Oprt8D+AHe0kq1ik7TK+Cvap/oBRN1tfmjFjDWdezOfns8edp9l TxeIBtDpJSb4hku8f35v+2vKvvGg1tzZBiCqxnO4TTIeiVOpZCJJAxO55Amr8SPE/L /TQYKK7bxt2dtRoTCc+fN9VwvRYH6C68K9mQpG6w= From: Leo Prikler Date: Fri, 13 Dec 2019 14:05:24 +0100 Message-Id: <20191213130524.14180-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-telega) [phases]: : Rename to telega-paths-patch. : Substitute ffplay path. [propagated-inputs] : Move from here ... [inputs] : ... to here. --- gnu/packages/emacs-xyz.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ae7e7a64cc..bc36b5dbce 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20113,10 +20113,18 @@ fish-completion. It can be used in both Eshell and M-x shell.") (("python3 run_tests.py") "")) #t)) - ;; Modify telega-util to reflect unique dir name in - ;; `telega-install-data' phase. - (add-after 'unpack 'telega-data-patch - (lambda _ + (add-after 'unpack 'telega-paths-patch + (lambda* (#:key inputs #:allow-other-keys) + ;; Hardcode `ffplay path. + (let ((ffplay-bin (string-append (assoc-ref inputs "ffmpeg") + "/bin/ffplay"))) + (substitute* "telega-ffplay.el" + (("\\(executable-find \"ffplay\"\\)") + (string-append + "(and (file-executable-p \"" ffplay-bin "\")" + "\"" ffplay-bin "\")")))) + ;; Modify telega-util to reflect unique dir name in + ;; `telega-install-data' phase. (substitute* "telega-util.el" (("\\(concat \"etc/\" filename\\) telega--lib-directory") "(concat \"telega-data/\" filename) @@ -20149,7 +20157,6 @@ fish-completion. It can be used in both Eshell and M-x shell.") (invoke "python3" "server/run_tests.py") #t)) (delete 'configure) - ;; Build emacs-side using `emacs-build-system' (add-after 'compress-documentation 'emacs-add-source-to-load-path (assoc-ref emacs:%standard-phases 'add-source-to-load-path)) @@ -20168,9 +20175,10 @@ fish-completion. It can be used in both Eshell and M-x shell.") (assoc-ref emacs:%standard-phases 'build)) (add-after 'emacs-build 'emacs-make-autoloads (assoc-ref emacs:%standard-phases 'make-autoloads))))) + (inputs + `(("ffmpeg" ,ffmpeg))) ; mp4/gif support. (propagated-inputs `(("emacs-visual-fill-column" ,emacs-visual-fill-column) - ("ffmpeg" ,ffmpeg) ; mp4/gif support. ("libwebp" ,libwebp))) ; sticker support. (native-inputs `(("tdlib" ,tdlib)