From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#38590] [PATCH] gnu: emacs-telega: Don't propagate ffmpeg. Resent-Message-ID: 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) From: Leo Prikler Date: Fri, 13 Dec 2019 14:05:24 +0100 Message-Id: <20191213130524.14180-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38590@debbugs.gnu.org * 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 "ffmpe= g") + "/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 a= nd M-x shell.") (invoke "python3" "server/run_tests.py") #t)) (delete 'configure) - =20 ;; 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) --=20 2.24.1