diff mbox series

[bug#60108,v2] gnu: musescore: Fix build.

Message ID f5b6663812bd2158d398b00f44f68c1bd0644dfb.camel@planete-kraus.eu
State New
Headers show
Series [bug#60108,v2] gnu: musescore: Fix build. | expand

Commit Message

Vivien Kraus Dec. 15, 2022, 11:31 p.m. UTC 
From: Liliana Marie Prikler <liliana.prikler@gmail.com>

* gnu/packages/music.scm (musescore)[snippet]: Remove crashpad_handler and
associated install actions.
[arguments]<#:configure-flags>: Add “-DBUILD_DIAGNOSTICS=OFF”.
[inputs]: Add qtquickcontrols-5.
---
 gnu/packages/music.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


base-commit: 05e4efe0c83c09929d15a0f5faa23a9afc0079e4

Comments

Nicolas Goaziou Dec. 19, 2022, 5:19 p.m. UTC | #1 
Hello,

Vivien Kraus via Guix-patches via <guix-patches@gnu.org> writes:

> From: Liliana Marie Prikler <liliana.prikler@gmail.com>
>
> * gnu/packages/music.scm (musescore)[snippet]: Remove crashpad_handler and
> associated install actions.
> [arguments]<#:configure-flags>: Add “-DBUILD_DIAGNOSTICS=OFF”.
> [inputs]: Add qtquickcontrols-5.

Thanks to you both.

I added Vivien as a co-author and applied the patch. I'm closing this
issue. Feel free to re-open it if you think something is missing.

Regards,
diff mbox series

Patch

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 614eb57791..bde01cb312 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4787,14 +4787,19 @@  (define-public musescore
         (base32 "16rcwr6fzghv8100syzicabqg8jqvng3zzsi6h3ja4zkp9hcbkcr"))
        (modules '((guix build utils)))
        (snippet
-        ;; Remove unused libraries.
         '(begin
+           ;; Remove unused libraries...
            (for-each delete-file-recursively
-                     '("thirdparty/freetype"))))))
+                     '("thirdparty/freetype"))
+           ;; ... and precompiled binaries.
+           (delete-file-recursively "src/diagnostics/crashpad_handler")
+           (substitute* "src/diagnostics/CMakeLists.txt"
+             (("install") "#install"))))))
     (build-system qt-build-system)
     (arguments
      `(#:configure-flags
        `("-DDOWNLOAD_SOUNDFONT=OFF"
+         "-DBUILD_DIAGNOSTICS=OFF"
          "-DMUSESCORE_BUILD_CONFIG=release"
          "-DUSE_SYSTEM_FREETYPE=ON")
        ;; There are tests, but no simple target to run.  The command used to
@@ -4825,6 +4830,7 @@  (define-public musescore
            qtdeclarative-5
            qtgraphicaleffects
            qtnetworkauth-5
+           qtquickcontrols-5
            qtquickcontrols2-5
            qtscript
            qtsvg-5