guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#33290] [PATCH 7/8] gnu: demlo: Add workaround for go-1.11.


From: Pierre Neidhardt
Subject: [bug#33290] [PATCH 7/8] gnu: demlo: Add workaround for go-1.11.
Date: Tue, 6 Nov 2018 18:37:08 +0100

* 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






reply via email to

[Prev in Thread] Current Thread [Next in Thread]