me
/
guix
Archived
1
0
Fork 0
Code

gnu: spice-gtk: Fix indentation and normalize field order. 

* gnu/packages/spice.scm (spice-gtk): Fix indentation.  Move and re-order
inputs below arguments.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Maxim Cournoyer 2023-02-16 00:08:53 -05:00
parent 7b40cb7c6e
commit f702206a37
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 58 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
gnu/packages/spice.scm
View File

@ -141,73 +141,69 @@ which allows users to view a desktop computing environment.")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://spice-space.org/download/gtk/" "https://spice-space.org/download/gtk/"
"spice-gtk-" version ".tar.bz2")) "spice-gtk-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z")))) "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs
(list gstreamer
gst-plugins-base
gst-plugins-good
spice-protocol
;; These are required by the pkg-config files.
gtk+
pixman
openssl-1.1))
(inputs
`(("glib-networking" ,glib-networking)
("gobject-introspection" ,gobject-introspection)
("json-glib" ,json-glib)
("libepoxy" ,libepoxy)
("libjpeg" ,libjpeg-turbo)
("libxcb" ,libxcb)
("lz4" ,lz4)
("mesa" ,mesa)
("pulseaudio" ,pulseaudio)
("python" ,python)
("opus" ,opus)
("usbredir" ,usbredir)))
(native-inputs
`(("glib:bin" ,glib "bin")
("intltool" ,intltool)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags '("--enable-gstaudio"
'("--enable-gstaudio" "--enable-gstvideo"
"--enable-gstvideo" "--enable-pulse"
"--enable-pulse" "--enable-vala"
"--enable-vala" "--enable-introspection")
"--enable-introspection") #:phases
#:phases (modify-phases %standard-phases
(modify-phases %standard-phases (add-before 'check 'disable-session-test
(add-before 'check 'disable-session-test (lambda _
(lambda _ ;; XXX: Disable session tests, because they require USB support,
;; XXX: Disable session tests, because they require USB support, ;; which is not available in the build container.
;; which is not available in the build container. (substitute* "tests/Makefile"
(substitute* "tests/Makefile" (("test-session\\$\\(EXEEXT\\) ") ""))))
(("test-session\\$\\(EXEEXT\\) ") "")) (add-after 'install 'patch-la-files
#t)) (lambda* (#:key inputs outputs #:allow-other-keys)
(add-after 'install 'patch-la-files (let ((out (assoc-ref outputs "out"))
(lambda* (#:key inputs outputs #:allow-other-keys) (libjpeg (assoc-ref inputs "libjpeg")))
(let ((out (assoc-ref outputs "out")) ;; Add an absolute reference for libjpeg in the .la files
(libjpeg (assoc-ref inputs "libjpeg"))) ;; so it does not have to be propagated.
;; Add an absolute reference for libjpeg in the .la files (substitute* (find-files (string-append out "/lib") "\\.la$")
;; so it does not have to be propagated. (("-ljpeg")
(substitute* (find-files (string-append out "/lib") "\\.la$") (string-append "-L" libjpeg "/lib -ljpeg"))))))
(("-ljpeg") (add-after 'install 'wrap-spicy
(string-append "-L" libjpeg "/lib -ljpeg"))) (lambda* (#:key inputs outputs #:allow-other-keys)
#t))) (let ((out (assoc-ref outputs "out"))
(add-after (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
'install 'wrap-spicy (wrap-program (string-append out "/bin/spicy")
(lambda* (#:key inputs outputs #:allow-other-keys) `("GST_PLUGIN_SYSTEM_PATH" ":"
(let ((out (assoc-ref outputs "out")) prefix (,gst-plugin-path)))))))))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) (native-inputs
(wrap-program (string-append out "/bin/spicy") `(("glib:bin" ,glib "bin")
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))) ("intltool" ,intltool)
#t))))) ("pkg-config" ,pkg-config)
("vala" ,vala)))
(inputs
`(("glib-networking" ,glib-networking)
("gobject-introspection" ,gobject-introspection)
("json-glib" ,json-glib)
("libepoxy" ,libepoxy)
("libjpeg" ,libjpeg-turbo)
("libxcb" ,libxcb)
("lz4" ,lz4)
("mesa" ,mesa)
("pulseaudio" ,pulseaudio)
("python" ,python)
("opus" ,opus)
("usbredir" ,usbredir)))
(propagated-inputs
(list gstreamer
gst-plugins-base
gst-plugins-good
spice-protocol
;; These are required by the pkg-config files.
gtk+
pixman
openssl-1.1))
(synopsis "Gtk client and libraries for SPICE remote desktop servers") (synopsis "Gtk client and libraries for SPICE remote desktop servers")
(description "Gtk client and libraries for SPICE remote desktop servers.") (description "Gtk client and libraries for SPICE remote desktop servers.")
(home-page "https://www.spice-space.org") (home-page "https://www.spice-space.org")