[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/12: gnu: yoshimi: Use gexp.
From: |
guix-commits |
Subject: |
09/12: gnu: yoshimi: Use gexp. |
Date: |
Tue, 7 Feb 2023 09:04:59 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit dd62d949897e7e0e1192a1fe552935144f832fb3
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Tue Feb 7 11:40:04 2023 +0100
gnu: yoshimi: Use gexp.
* gnu/packages/music.scm (yoshimi)[arguments]: Use gexp and drop trailing #t
from build phases.
---
gnu/packages/music.scm | 49 ++++++++++++++++++++++++-------------------------
1 file changed, 24 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 9be77b75af..5ba0f9272a 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3124,31 +3124,30 @@ capabilities, custom envelopes, effects, etc.")
(base32 "1axrbk1qwsiq77g5957db744481zb2v158psnk2w530wxhls2442"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; there are no tests
- #:configure-flags
- (list (string-append "-DCMAKE_INSTALL_DATAROOTDIR="
- (assoc-ref %outputs "out") "/share"))
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'enter-dir
- (lambda _ (chdir "src") #t))
- ;; Move SSE compiler optimization flags from generic target to
- ;; athlon64 and core2 targets, because otherwise the build would fail
- ;; on non-Intel machines.
- (add-after 'unpack 'fix-paths
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* (list "src/Interface/InterChange.cpp"
- "src/Misc/Bank.cpp"
- "src/Misc/Config.cpp")
- (("/usr/share") (string-append (assoc-ref outputs "out")
- "/share")))))
- (add-after 'unpack 'remove-sse-flags-from-generic-target
- (lambda _
- (substitute* "src/CMakeLists.txt"
- (("-msse -msse2 -mfpmath=sse") "")
- (("-march=(athlon64|core2)" flag)
- (string-append flag " -msse -msse2 -mfpmath=sse")))
- #t)))))
+ (list
+ #:tests? #f ; there are no tests
+ #:configure-flags
+ #~(list (string-append "-DCMAKE_INSTALL_DATAROOTDIR="
+ #$output "/share"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'enter-dir
+ (lambda _ (chdir "src")))
+ (add-after 'unpack 'fix-paths
+ (lambda _
+ (substitute* (list "src/Interface/InterChange.cpp"
+ "src/Misc/Bank.cpp"
+ "src/Misc/Config.cpp")
+ (("/usr/share") (string-append #$output "/share")))))
+ ;; Move SSE compiler optimization flags from generic target to
+ ;; athlon64 and core2 targets, because otherwise the build would fail
+ ;; on non-Intel machines.
+ (add-after 'unpack 'remove-sse-flags-from-generic-target
+ (lambda _
+ (substitute* "src/CMakeLists.txt"
+ (("-msse -msse2 -mfpmath=sse") "")
+ (("-march=(athlon64|core2)" flag)
+ (string-append flag " -msse -msse2 -mfpmath=sse"))))))))
(inputs
(list alsa-lib
boost
- branch master updated (46952ddc34 -> f55cc9cb0f), guix-commits, 2023/02/07
- 04/12: gnu: libsmf: Use gexp., guix-commits, 2023/02/07
- 05/12: gnu: libsmf: Simplify description., guix-commits, 2023/02/07
- 08/12: gnu: yoshimi: Drop input labels., guix-commits, 2023/02/07
- 02/12: gnu: lmms: Use Gexp., guix-commits, 2023/02/07
- 01/12: gnu: lmms: Drop input labels., guix-commits, 2023/02/07
- 12/12: gnu: Add bitmapperbs., guix-commits, 2023/02/07
- 11/12: gnu: yoshimi: Use JACK 2., guix-commits, 2023/02/07
- 09/12: gnu: yoshimi: Use gexp.,
guix-commits <=
- 10/12: gnu: lmms: Use JACK 2., guix-commits, 2023/02/07
- 06/12: gnu: foo-yc20: Drop input labels., guix-commits, 2023/02/07
- 07/12: gnu: foo-yc20: Use gexp., guix-commits, 2023/02/07
- 03/12: gnu: lmms: Reformat description., guix-commits, 2023/02/07