From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id fyCVGdvMLF/jWwAA0tVLHw (envelope-from ) for ; Fri, 07 Aug 2020 03:39:07 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id YPD+FNvMLF+sNgAAB5/wlQ (envelope-from ) for ; Fri, 07 Aug 2020 03:39:07 +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 D2D5C94051F for ; Fri, 7 Aug 2020 03:39:06 +0000 (UTC) Received: from localhost ([::1]:47290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3tDl-0003ob-Qd for larch@yhetil.org; Thu, 06 Aug 2020 23:39:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3tDi-0003oU-1N for guix-patches@gnu.org; Thu, 06 Aug 2020 23:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3tDh-0003My-Ok for guix-patches@gnu.org; Thu, 06 Aug 2020 23:39:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k3tDh-0006uc-My for guix-patches@gnu.org; Thu, 06 Aug 2020 23:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42728] [PATCH] gnu: emacs-emms: Fix build of emms-print-metadata. Resent-From: Brett Gilio Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Aug 2020 03:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42728 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Pierre Neidhardt Cc: 42728@debbugs.gnu.org Received: via spool by 42728-submit@debbugs.gnu.org id=B42728.159677153426555 (code B ref 42728); Fri, 07 Aug 2020 03:39:01 +0000 Received: (at 42728) by debbugs.gnu.org; 7 Aug 2020 03:38:54 +0000 Received: from localhost ([127.0.0.1]:55397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k3tDa-0006uE-6w for submit@debbugs.gnu.org; Thu, 06 Aug 2020 23:38:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k3tDY-0006tz-5H for 42728@debbugs.gnu.org; Thu, 06 Aug 2020 23:38:53 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:34647) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3tDS-0003Jk-3o; Thu, 06 Aug 2020 23:38:46 -0400 Received: from [2605:6000:1a0d:48fb::e9] (port=57184 helo=lenovo-t430) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1k3tDR-0001mM-DY; Thu, 06 Aug 2020 23:38:45 -0400 From: Brett Gilio References: <20200806082935.13379-1-mail@ambrevar.xyz> Date: Thu, 06 Aug 2020 22:38:56 -0500 In-Reply-To: <20200806082935.13379-1-mail@ambrevar.xyz> (Pierre Neidhardt's message of "Thu, 6 Aug 2020 10:29:35 +0200") Message-ID: <874kpfjfan.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: wqzlTa3XTK/r Pierre Neidhardt writes: > * gnu/packages/emacs-xyz.scm (emacs-emms): Inherit from > emacs-emms-print-metadata. > [inputs]: Add emms-print-metadata. > [arguments]: Fix path to emms-print-metadata. > --- > gnu/packages/emacs-xyz.scm | 53 +++++++++++++++++++++++++++----------- > 1 file changed, 38 insertions(+), 15 deletions(-) > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index 9943af0fcb..5d353d0d57 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -1484,9 +1484,9 @@ incrementally confined in Isearch manner.") > ;;; Multimedia. > ;;; > > -(define-public emacs-emms > +(define emacs-emms-print-metadata > (package > - (name "emacs-emms") > + (name "emacs-emms-print-metadata") > (version "5.42") > (source > (origin > @@ -1495,6 +1495,37 @@ incrementally confined in Isearch manner.") > "emms-" version ".tar")) > (sha256 > (base32 "1khx1fvllrs6w9kxk12mp1hj309c90mc7lkq1vvlqlr7vd6zmnpj")))) > + (build-system gnu-build-system) > + (arguments > + `(#:make-flags '("emms-print-metadata") > + #:tests? #f ; No tests. > + #:phases > + (modify-phases %standard-phases > + (delete 'configure) > + (replace 'install > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out"))) > + (install-file "src/emms-print-metadata" > + (string-append out "/bin")) > + (install-file "emms-print-metadata.1" > + (string-append out "/share/man/man1")) > + #t)))))) > + (inputs > + `(("taglib" ,taglib))) > + (home-page "https://www.gnu.org/software/emms/") > + (synopsis "The Emacs Multimedia System") > + (description > + "EMMS is the Emacs Multimedia System. It is a small front-end which > +can control one of the supported external players. Thus, it supports > +whatever formats are supported by your music player. It also > +supports tagging and playlist management, all behind a clean and > +light user interface.") > + (license license:gpl3+))) > + > +(define-public emacs-emms > + (package > + (inherit emacs-emms-print-metadata) > + (name "emacs-emms") > (build-system emacs-build-system) > (arguments > `(#:phases > @@ -1504,6 +1535,7 @@ incrementally confined in Isearch manner.") > ;; so that everything works out-of-the-box. > (lambda* (#:key inputs outputs #:allow-other-keys) > (let ((out (assoc-ref outputs "out")) > + (emms-print-metadata (assoc-ref inputs "emms-print-metadata")) > (flac (assoc-ref inputs "flac")) > (vorbis (assoc-ref inputs "vorbis-tools")) > (alsa (assoc-ref inputs "alsa-utils")) > @@ -1528,7 +1560,7 @@ incrementally confined in Isearch manner.") > (string-append opus "/bin/opusinfo"))) > (emacs-substitute-variables "emms-info-libtag.el" > ("emms-info-libtag-program-name" > - (string-append out "/bin/emms-print-metadata"))) > + (string-append emms-print-metadata "/bin/emms-print-metadata"))) > (emacs-substitute-variables "emms-info-mp3info.el" > ("emms-info-mp3info-program-name" > (string-append mp3info "/bin/mp3info"))) > @@ -1545,23 +1577,14 @@ incrementally confined in Isearch manner.") > (string-append "\"" mutagen "/bin/mid3v2\""))) > #t)))))) > (inputs > - `(("alsa-utils" ,alsa-utils) > + `(("emms-print-metadata" ,emacs-emms-print-metadata) > + ("alsa-utils" ,alsa-utils) > ("flac" ,flac) ;for metaflac > ("vorbis-tools" ,vorbis-tools) > ("mpg321" ,mpg321) > - ("taglib" ,taglib) > ("mp3info" ,mp3info) > ("mutagen" ,python-mutagen) > - ("opus-tools" ,opus-tools))) > - (home-page "https://www.gnu.org/software/emms/") > - (synopsis "The Emacs Multimedia System") > - (description > - "EMMS is the Emacs Multimedia System. It is a small front-end which > -can control one of the supported external players. Thus, it supports > -whatever formats are supported by your music player. It also > -supports tagging and playlist management, all behind a clean and > -light user interface.") > - (license license:gpl3+))) > + ("opus-tools" ,opus-tools))))) > > (define-public emacs-emms-mode-line-cycle > (package > > base-commit: 327ebd55ca595aa3fac41139c906fbe05b5b6e0b Maybe I am not completely understanding, but wouldn't it make more sense for emms-print-metadata to inherit from emms and not the other way around?