diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-07-15 17:25:14 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-07-15 17:42:04 -0400 |
| commit | 154d2700129c189a4995c34b412d0472aeb76025 (patch) | |
| tree | 36c87a6484d7d20a13b4ee1ac53681b13166ead6 | |
| parent | e2bd7836577c3c055302faec0fdbb41e2e67b342 (diff) | |
| download | guix-154d2700129c189a4995c34b412d0472aeb76025.tar.gz guix-154d2700129c189a4995c34b412d0472aeb76025.zip | |
vala-next: Do not wrap binaries, use gexps, default to 'gcc' rather than 'cc'.
Fixes <https://issues.guix.gnu.org/56467>.
Reported by <two@envs.net>.
* gnu/packages/gnome.scm (vala-next)[arguments]: Override inherited field.
Use gexps.
[phases]{use-gcc-by-default}: New phase.
{patch-docbook-xml}: Use search-input-directory.
{glib-or-gtk-wrap}: Delete phase.
| -rw-r--r-- | gnu/packages/gnome.scm | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 04f69543d5..96ec260dec 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4384,7 +4384,32 @@ targeting the GNOME stack simple.") "vala-" version ".tar.xz")) (sha256 (base32 - "0k0jj3xwjq222x0hbqqy5bykhgk1f1wsb85bqcdgsnbqn6dn3jb6")))))) + "0k0jj3xwjq222x0hbqqy5bykhgk1f1wsb85bqcdgsnbqn6dn3jb6")))) + (arguments + (list + #:configure-flags #~(list "CC=gcc" "--enable-coverage") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'use-gcc-by-default + (lambda _ + (substitute* "codegen/valaccodecompiler.c" + (("cc_command = \"cc\"") + "cc_command = \"gcc\"")))) + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc/manual" + (substitute* '("manual.xml" "version.xml.in") + (("http://www.oasis-open.org/docbook/xml/4.4/") + (search-input-directory inputs "xml/dtd/docbook")))))) + (add-before 'check 'pre-check + (lambda _ + (substitute* "valadoc/tests/libvaladoc/tests-extra-environment.sh" + (("export PKG_CONFIG_PATH=" m) + (string-append m "$PKG_CONFIG_PATH:"))))) + ;; Wrapping the binaries breaks vala's behavior adaptations based on + ;; the file name of the program executed (vala: compile and execute, + ;; valac: compile into a binary). + (delete 'glib-or-gtk-wrap)))))) ;;; An older variant kept to build libsoup-minimal-2. (define-public vala-0.52 |