From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gK5JE-0004bf-CK for guix-patches@gnu.org; Tue, 06 Nov 2018 12:38:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gK5Io-0005WX-PZ for guix-patches@gnu.org; Tue, 06 Nov 2018 12:38:23 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:33361) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gK5Ij-0005Q5-IM for guix-patches@gnu.org; Tue, 06 Nov 2018 12:38:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gK5Ij-0008U2-Ew for guix-patches@gnu.org; Tue, 06 Nov 2018 12:38:05 -0500 Subject: [bug#33290] [PATCH 7/8] gnu: demlo: Add workaround for go-1.11. Resent-Message-ID: From: Pierre Neidhardt Date: Tue, 6 Nov 2018 18:37:08 +0100 Message-Id: <20181106173709.9883-6-mail@ambrevar.xyz> In-Reply-To: <20181106173709.9883-1-mail@ambrevar.xyz> References: <87in1ayurm.fsf@ambrevar.xyz> <20181106173709.9883-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 33290@debbugs.gnu.org * gnu/packages/music.scm (demlo): Add workaround for go-1.11. --- gnu/packages/music.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index cdd06647e..bbdf58b18 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4235,7 +4235,10 @@ console music players.") ("go-github-com-michiwend-gomusicbrainz" ,go-github-com-michiwend-gomusicbrainz) ("go-github-com-stevedonovan-luar" ,go-github-com-stevedonovan-luar) ("go-github-com-wtolson-go-taglib" ,go-github-com-wtolson-go-taglib) - ("go-github-com-yookoala-realpath" ,go-github-com-yookoala-realpath))) + ("go-github-com-yookoala-realpath" ,go-github-com-yookoala-realpath) + ;; Those should not be needed, see TODO below. + ("pkg-config" ,pkg-config) + ("taglib" ,taglib))) (inputs `(("chromaprint" ,chromaprint) ("ffmpeg" ,ffmpeg))) @@ -4243,6 +4246,23 @@ console music players.") `(#:import-path "gitlab.com/ambrevar/demlo" #:phases (modify-phases %standard-phases + ;; TODO: With our go-1.11, the golua .pkg is not re-used and gets + ;; rebuilt (https://bugs.gnu.org/32919). Thus we need to + ;; re-specify the special flags of golua, the pkg-config + taglib + ;; native-inputs, and the 'check phase below. + (replace 'build + (lambda* (#:key import-path #:allow-other-keys) + (invoke "go" "install" + "-v" ; print the name of packages as they are compiled + "-x" ; print each command as it is invoked + "-ldflags=-s -w" ; strip the symbol table and debug + "-tags" "llua" ; Latest Lua on Guix does not have a version number. + import-path))) + (replace 'check + (lambda* (#:key import-path #:allow-other-keys) + (invoke "go" "test" + "-tags" "llua" ; Latest Lua on Guix does not have a version number. + import-path))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- 2.19.1