all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Vivien Kraus via Guix-patches via <guix-patches@gnu.org>
To: 60108@debbugs.gnu.org
Cc: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Subject: [bug#60108] [PATCH v2] gnu: musescore: Fix build.
Date: Fri, 16 Dec 2022 00:31:00 +0100	[thread overview]
Message-ID: <f5b6663812bd2158d398b00f44f68c1bd0644dfb.camel@planete-kraus.eu> (raw)
In-Reply-To: <26ccc41a0b59e854f261e65cfee65803e78746f7.camel@gmail.com>

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(-)

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

base-commit: 05e4efe0c83c09929d15a0f5faa23a9afc0079e4
-- 
2.38.1




  reply	other threads:[~2022-12-19 16:47 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-15 23:31 [bug#60108] [PATCH] gnu: musescore: Fix build Liliana Marie Prikler
2022-12-15 23:31 ` Vivien Kraus via Guix-patches via [this message]
2022-12-19 17:19   ` [bug#60108] [PATCH v2] " Nicolas Goaziou
2022-12-16 17:39 ` [bug#60108] [PATCH] " Nicolas Goaziou
2022-12-18 16:27 ` Vivien Kraus via Guix-patches via
2022-12-18 20:12   ` Vivien Kraus via Guix-patches via
2022-12-19 15:40     ` Nicolas Goaziou
2022-12-19 16:52       ` Vivien Kraus via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f5b6663812bd2158d398b00f44f68c1bd0644dfb.camel@planete-kraus.eu \
    --to=guix-patches@gnu.org \
    --cc=60108@debbugs.gnu.org \
    --cc=mail@nicolasgoaziou.fr \
    --cc=vivien@planete-kraus.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.