diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-05-05 20:43:21 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-05-05 20:43:21 +0200 |
| commit | 87a40d7203a813921b3ef0805c2b46c0026d6c31 (patch) | |
| tree | cebad70c1df30969005c18c4d9faa39d7d80cbf6 /gnu/packages/audio.scm | |
| parent | ba151b7e1a9cc0baf932b5c5e0c916e54d2e27f4 (diff) | |
| parent | 751d1f01e4f0607d41e4c859d944753b18466652 (diff) | |
| download | patches-87a40d7203a813921b3ef0805c2b46c0026d6c31.tar patches-87a40d7203a813921b3ef0805c2b46c0026d6c31.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/audio.scm')
| -rw-r--r-- | gnu/packages/audio.scm | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 32839ab8c9..eb7064430f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Jonathan Frederickson <jonathan@terracrypt.net> +;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2320,18 +2321,20 @@ background file post-processing.") (name "supercollider") (version "3.10.4") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/supercollider/supercollider" - "/releases/download/Version-" version - "/SuperCollider-" version "-Source-linux.tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/supercollider/supercollider.git") + (commit (string-append "Version-" version)) + ;; for nova-simd, nova-tt, hidapi, TLSF, oscpack + (recursive? #t))) + (file-name (git-file-name name version)) (sha256 (base32 - "0x11g3pfw11m6v18qfpfl5w99dbmf73g4z7wvwhrj1a4qv2dn084")))) + "0xdg1dx0y0agircnkn4bg3jpw184xc5pn28k7rrzgjh1rdnyzz24")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DSYSTEM_BOOST=on" "-DSYSTEM_YAMLCPP=on" - "-DSC_QT=off" + "-DSC_QT=off" "-DCMAKE_BUILD_TYPE=Release" "-DSC_EL=off") ;scel is packaged individually as ;emacs-scel #:modules ((guix build utils) @@ -2369,7 +2372,19 @@ background file post-processing.") (("add_subdirectory\\(sclang\\)") "")) (delete-file "testsuite/sclang/CMakeLists.txt") - #t))))) + #t)) + (add-after 'disable-broken-tests '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 "\")"))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs |