Zhu Zihao wrote 2 years ago
(address . guix-patches@gnu.org)(name . Zhu Zihao)(address . all_but_last@163.com)
20230428133329.31666-1-all_but_last@163.com
* gnu/packages/audio.scm (supercollider)[source]: Use G-expression in snippet.
[arguments]: Use G-expressions.
<#:phases>: Replace `(assoc-ref outputs ...)` with `#$output`.
---
gnu/packages/audio.scm | 102 ++++++++++++++++++++---------------------
1 file changed, 51 insertions(+), 51 deletions(-)
Toggle diff (122 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index dca5e516a1..69570109d9 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3460,64 +3460,64 @@ (define-public supercollider
;; The build system doesn't allow us to unbundle the following
;; libraries. hidapi is also heavily patched and upstream not
;; actively maintained.
- '(let ((keep-dirs '("nova-simd" "nova-tt" "hidapi"
- "TLSF-2.4.6" "oscpack_1_1_0" "." "..")))
- (with-directory-excursion "./external_libraries"
- (for-each
- delete-file-recursively
- (scandir "."
- (lambda (x)
- (and (eq? (stat:type (stat x)) 'directory)
- (not (member (basename x) keep-dirs)))))))
- ;; To find the Guix provided ableton-link library.
- (substitute* "lang/CMakeLists.txt"
- (("include\\(\\.\\./external_libraries/link/\
+ #~(let ((keep-dirs '("nova-simd" "nova-tt" "hidapi"
+ "TLSF-2.4.6" "oscpack_1_1_0" "." "..")))
+ (with-directory-excursion "./external_libraries"
+ (for-each
+ delete-file-recursively
+ (scandir "."
+ (lambda (x)
+ (and (eq? (stat:type (stat x)) 'directory)
+ (not (member (basename x) keep-dirs)))))))
+ ;; To find the Guix provided ableton-link library.
+ (substitute* "lang/CMakeLists.txt"
+ (("include\\(\\.\\./external_libraries/link/\
AbletonLinkConfig\\.cmake\\)")
- "find_package(AbletonLink NAMES AbletonLink ableton-link \
+ "find_package(AbletonLink NAMES AbletonLink ableton-link \
link REQUIRED)"))))))
(build-system cmake-build-system)
(outputs
'("out" ;core language
"ide")) ;qt ide
(arguments
- `(#:configure-flags '("-DSYSTEM_BOOST=ON"
- "-DSYSTEM_YAMLCPP=ON"
- "-DSC_QT=ON"
- "-DCMAKE_BUILD_TYPE=Release"
- "-DFORTIFY=ON"
- ;; "-DLIBSCSYNTH=ON" ; TODO: Re-enable?
- "-DSC_EL=OFF") ;scel is packaged individually as emacs-scel
- #:phases
- (modify-phases %standard-phases
- ;; HOME must be defined otherwise supercollider throws a "ERROR:
- ;; Primitive '_FileMkDir' failed." error when generating the doc.
- ;; The graphical tests also hang without it.
- (add-after 'unpack 'set-home-directory
- (lambda _
- (setenv "HOME" (getcwd))))
- (add-after 'unpack 'patch-scclass-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (scclass-dir
- (string-append out
- "/share/SuperCollider/SCClassLibrary")))
- (substitute* "lang/LangSource/SC_LanguageConfig.cpp"
- (((string-append
- "SC_Filesystem::instance\\(\\)\\.getDirectory"
- "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME"))
- (string-append "Path(\"" scclass-dir "\")"))))))
- (add-before 'build 'prepare-x
- (lambda _
- (system "Xvfb &")
- (setenv "DISPLAY" ":0")))
- (add-before 'install 'install-ide
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (ide (assoc-ref outputs "ide"))
- (scide "editors/sc-ide/scide"))
- (install-file scide
- (string-append ide "/bin"))
- (delete-file scide)))))))
+ (list
+ #:configure-flags
+ #~(list "-DSYSTEM_BOOST=ON"
+ "-DSYSTEM_YAMLCPP=ON"
+ "-DSC_QT=ON"
+ "-DCMAKE_BUILD_TYPE=Release"
+ "-DFORTIFY=ON"
+ ;; "-DLIBSCSYNTH=ON" ; TODO: Re-enable?
+ "-DSC_EL=OFF") ;scel is packaged individually as emacs-scel
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; HOME must be defined otherwise supercollider throws a "ERROR:
+ ;; Primitive '_FileMkDir' failed." error when generating the doc.
+ ;; The graphical tests also hang without it.
+ (add-after 'unpack 'set-home-directory
+ (lambda _
+ (setenv "HOME" (getcwd))))
+ (add-after 'unpack 'patch-scclass-dir
+ (lambda _
+ (let* ((scclass-dir
+ (string-append #$output
+ "/share/SuperCollider/SCClassLibrary")))
+ (substitute* "lang/LangSource/SC_LanguageConfig.cpp"
+ (((string-append
+ "SC_Filesystem::instance\\(\\)\\.getDirectory"
+ "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME"))
+ (string-append "Path(\"" scclass-dir "\")"))))))
+ (add-before 'build 'prepare-x
+ (lambda _
+ (system "Xvfb &")
+ (setenv "DISPLAY" ":0")))
+ (add-before 'install 'install-ide
+ (lambda _
+ (let* ((ide #$output:ide)
+ (scide "editors/sc-ide/scide"))
+ (install-file scide
+ (string-append ide "/bin"))
+ (delete-file scide)))))))
(native-inputs
(list ableton-link pkg-config qttools-5 xorg-server-for-tests))
(inputs (list jack-1
--
2.39.2