diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-02-16 00:14:12 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-02-25 14:46:51 -0500 |
| commit | d5fa1203f654616c5991cad55ed89ca47051ecb3 (patch) | |
| tree | be316efa289fdf4d66afbd582b3387a9f25013e6 /gnu/packages/spice.scm | |
| parent | da6d173980820a6f8e119ebba17f0e61b8ec9468 (diff) | |
| download | guix-d5fa1203f654616c5991cad55ed89ca47051ecb3.tar guix-d5fa1203f654616c5991cad55ed89ca47051ecb3.tar.gz | |
gnu: spice-gtk: Use gexps.
* gnu/packages/spice.scm (spice-gtk) [arguments]: Streamline and use gexps.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'gnu/packages/spice.scm')
| -rw-r--r-- | gnu/packages/spice.scm | 59 |
1 files 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 @@ which allows users to view a desktop computing environment.") "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 |