From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 61576@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#61576] [PATCH 03/21] gnu: spice-gtk: Use gexps.
Date: Fri, 17 Feb 2023 12:00:44 -0500 [thread overview]
Message-ID: <20230217170103.10147-4-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20230217170103.10147-2-maxim.cournoyer@gmail.com>
* gnu/packages/spice.scm (spice-gtk) [arguments]: Streamline and use gexps.
---
gnu/packages/spice.scm | 59 +++++++++++++++++++++---------------------
1 file changed, 29 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index c513e3db13..3d625a063a 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -148,35 +148,34 @@ (define-public spice-gtk
"1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--enable-gstaudio"
- "--enable-gstvideo"
- "--enable-pulse"
- "--enable-vala"
- "--enable-introspection")
- #:phases
- (modify-phases %standard-phases
- (add-before 'check 'disable-session-test
- (lambda _
- ;; XXX: Disable session tests, because they require USB support,
- ;; which is not available in the build container.
- (substitute* "tests/Makefile"
- (("test-session\\$\\(EXEEXT\\) ") ""))))
- (add-after 'install 'patch-la-files
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (libjpeg (assoc-ref inputs "libjpeg")))
- ;; Add an absolute reference for libjpeg in the .la files
- ;; so it does not have to be propagated.
- (substitute* (find-files (string-append out "/lib") "\\.la$")
- (("-ljpeg")
- (string-append "-L" libjpeg "/lib -ljpeg"))))))
- (add-after 'install 'wrap-spicy
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
- (wrap-program (string-append out "/bin/spicy")
- `("GST_PLUGIN_SYSTEM_PATH" ":"
- prefix (,gst-plugin-path)))))))))
+ (list
+ #:configure-flags #~(list "--enable-gstaudio"
+ "--enable-gstvideo"
+ "--enable-pulse"
+ "--enable-vala"
+ "--enable-introspection")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'disable-session-test
+ (lambda _
+ ;; XXX: Disable session tests, because they require USB support,
+ ;; which is not available in the build container.
+ (substitute* "tests/Makefile"
+ (("test-session\\$\\(EXEEXT\\) ") ""))))
+ (add-after 'install 'patch-la-files
+ (lambda _
+ ;; Add an absolute reference for libjpeg in the .la files
+ ;; so it does not have to be propagated.
+ (substitute* (find-files (string-append #$output "/lib")
+ "\\.la$")
+ (("-ljpeg")
+ (string-append "-L" #$(this-package-input "libjpeg-turbo")
+ "/lib -ljpeg")))))
+ (add-after 'install 'wrap-spicy
+ (lambda* (#:key outputs #:allow-other-keys)
+ (wrap-program (search-input-file outputs "bin/spicy")
+ `("GST_PLUGIN_SYSTEM_PATH" ":"
+ prefix (,(getenv "GST_PLUGIN_SYSTEM_PATH")))))))))
(native-inputs
(list `(,glib "bin")
intltool
--
2.39.1
next prev parent reply other threads:[~2023-02-17 17:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 16:51 [bug#61576] [PATCH 00/21] Allow USB redirection as an unprivileged user in in GNOME Boxes Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 01/21] gnu: spice-gtk: Fix indentation and normalize field order Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 02/21] gnu: spice-gtk: Remove input labels Maxim Cournoyer
2023-02-26 4:47 ` [bug#61576] [PATCH 00/21] Allow USB redirection as an unprivileged user in in GNOME Boxes Maxim Cournoyer
2023-02-17 17:00 ` Maxim Cournoyer [this message]
2023-02-17 17:00 ` [bug#61576] [PATCH 04/21] gnu: spice-gtk: Update to 0.42 Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 05/21] gnu: spice-gtk: Propagate libjpeg-turbo, lz4, opus, and usbredir Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 06/21] gnu: spice-protocol: Update to 0.14.4 Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 07/21] gnu: usbredir: Update to 0.13.0 Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 08/21] gnu: virglrenderer: Update to 0.7.0 Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 09/21] gnu: libcacard: Remove obsolete configure flags Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 10/21] gnu: spice: Update to 0.15.1 Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 11/21] gnu: spice-vdagent: Update to 0.22.1 Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 12/21] gnu: usbutils: Update to 015 Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 13/21] gnu: phodav: Propagate glib, libsoup and libxml2 Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 14/21] gnu: spice-gtk: Enable support for polkit, webdav and others Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 15/21] gnu: osinfo-db: Use libsoup 3 Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 16/21] gnu: gnome-boxes: Update to 43.3 Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 17/21] services: gnome-polkit-settings: Add spice-gtk Maxim Cournoyer
2023-02-17 17:00 ` [bug#61576] [PATCH 18/21] services: desktop: Extract a new gnome-package procedure Maxim Cournoyer
2023-02-17 17:01 ` [bug#61576] [PATCH 19/21] services: gnome-desktop-service-type: Extend setuid-program-service-type Maxim Cournoyer
2023-02-17 17:01 ` [bug#61576] [PATCH 20/21] gnu: gnome-boxes: Mention extra configuration requirements Maxim Cournoyer
2023-02-17 17:01 ` [bug#61576] [PATCH 21/21] gnu: spice-gtk: Adjust the default file name of the ACL helper binary Maxim Cournoyer
2023-02-25 19:53 ` bug#61576: [PATCH 00/21] Allow USB redirection as an unprivileged user in in GNOME Boxes Maxim Cournoyer
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=20230217170103.10147-4-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=61576@debbugs.gnu.org \
/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.