unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Pierre Neidhardt <mail@ambrevar.xyz>
To: 33290@debbugs.gnu.org
Subject: [bug#33290] [PATCH 7/8] gnu: demlo: Add workaround for go-1.11.
Date: Tue,  6 Nov 2018 18:37:08 +0100	[thread overview]
Message-ID: <20181106173709.9883-6-mail@ambrevar.xyz> (raw)
In-Reply-To: <20181106173709.9883-1-mail@ambrevar.xyz>

* 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

  parent reply	other threads:[~2018-11-06 17:38 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-06 17:16 [bug#33290] [PATCH 1/8] gnu: go-github-com-prometheus-common-expfmt: Disable tests for go-1.11 Pierre Neidhardt
2018-11-06 17:33 ` Leo Famulari
2018-11-06 17:34   ` Pierre Neidhardt
2018-11-06 17:37     ` [bug#33290] [PATCH 2/8] gnu: go-github-com-audriusbutkevicius-cli: " Pierre Neidhardt
2018-11-06 17:37       ` [bug#33290] [PATCH 3/8] gnu: go-gopkg.in-asn1-ber.v1: " Pierre Neidhardt
2018-11-06 17:37       ` [bug#33290] [PATCH 4/8] gnu: go-github-com-wtolson-go-taglib: " Pierre Neidhardt
2018-11-06 17:37       ` [bug#33290] [PATCH 5/8] gnu: go-gitlab-com-ambrevar-golua-unicode: Add workaround " Pierre Neidhardt
2018-11-06 17:37       ` [bug#33290] [PATCH 6/8] gnu: go-github-com-stevedonovan-luar: " Pierre Neidhardt
2018-11-06 17:37       ` Pierre Neidhardt [this message]
2018-11-06 17:37       ` [bug#33290] [PATCH 8/8] gnu: go: Update default to 1.11 Pierre Neidhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181106173709.9883-6-mail@ambrevar.xyz \
    --to=mail@ambrevar.xyz \
    --cc=33290@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).