GNU bug report logs - #61576
[PATCH 00/21] Allow USB redirection as an unprivileged user in in GNOME Boxes

Previous Next

Full log

View this message in rfc822 format

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 61576 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [bug#61576] [PATCH 03/21] gnu: spice-gtk: Use gexps.
Date: Fri, 17 Feb 2023 12:00:44 -0500

* 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 <at> tobias.gr>
 ;;; Copyright © 2019 Rutger Helling <rhelling <at> mykolab.com>
 ;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius <at> gnu.org>
-;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer <at> 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.